.gitignore | 1
COPYING | 2717
ChangeLog |27564
++++++++++
GL/Makefile.in | 333
GL/apple/Makefile.in | 349
GL/glx/Makefile.am | 1
GL/glx/Makefile.in | 330
GL/glx/glxcmds.c | 53
GL/glx/glxcmdsswap.c | 9
GL/glx/glxdrawable.h | 1
GL/glx/glxdri.c | 44
GL/glx/glxext.c | 9
GL/glx/glxext.h | 3
GL/glx/glxserver.h | 2
GL/mesa/Makefile.in | 360
GL/mesa/X/Makefile.in | 333
GL/mesa/glapi/Makefile.in | 327
GL/mesa/main/Makefile.in | 327
GL/mesa/math/Makefile.in | 327
GL/mesa/shader/Makefile.in | 360
GL/mesa/shader/grammar/Makefile.in | 327
GL/mesa/shader/slang/Makefile.in | 327
GL/mesa/swrast/Makefile.in | 327
GL/mesa/swrast_setup/Makefile.in | 327
GL/mesa/tnl/Makefile.in | 327
GL/mesa/vbo/Makefile.in | 327
Makefile.am | 12
Makefile.in | 374
XTrap/Makefile.in | 327
Xext/Makefile.in | 337
Xi/Makefile.in | 327
Xi/opendev.c | 4
acinclude.m4 | 33
aclocal.m4 | 679
afb/Makefile.in | 330
afb/afbbltC.c | 2
afb/afbbltCI.c | 2
afb/afbbltG.c | 2
afb/afbbltO.c | 2
afb/afbbltX.c | 2
afb/afbseg.c | 2
afb/afbtileC.c | 2
afb/afbtileG.c | 2
cfb/Makefile.in | 480
cfb/cfb8lineCO.c | 2
cfb/cfb8lineCP.c | 3
cfb/cfb8lineG.c | 2
cfb/cfb8lineX.c | 2
cfb/cfb8segC.c | 3
cfb/cfb8segCS.c | 4
cfb/cfb8segX.c | 3
cfb/cfb8setG.c | 3
cfb/cfbbltC.c | 2
cfb/cfbbltG.c | 2
cfb/cfbbltO.c | 2
cfb/cfbbltX.c | 2
cfb/cfbfillarcC.c | 2
cfb/cfbfillarcG.c | 2
cfb/cfbglrop8.c | 2
cfb/cfbply1rctC.c | 2
cfb/cfbply1rctG.c | 2
cfb/cfbseg.c | 2
cfb/cfbsolidC.c | 2
cfb/cfbsolidG.c | 2
cfb/cfbsolidX.c | 2
cfb/cfbtile32C.c | 2
cfb/cfbtile32G.c | 2
cfb/cfbtileoddC.c | 2
cfb/cfbtileoddG.c | 2
cfb/cfbzerarcC.c | 2
cfb/cfbzerarcG.c | 2
cfb/cfbzerarcX.c | 2
cfb32/Makefile.in | 478
cfb32/cfb8lineCO.c | 2
cfb32/cfb8lineCP.c | 3
cfb32/cfb8lineG.c | 2
cfb32/cfb8lineX.c | 2
cfb32/cfb8segC.c | 3
cfb32/cfb8segCS.c | 4
cfb32/cfb8segX.c | 3
cfb32/cfb8setG.c | 3
cfb32/cfbbltC.c | 2
cfb32/cfbbltG.c | 2
cfb32/cfbbltO.c | 2
cfb32/cfbbltX.c | 2
cfb32/cfbfillarcC.c | 2
cfb32/cfbfillarcG.c | 2
cfb32/cfbply1rctC.c | 2
cfb32/cfbply1rctG.c | 2
cfb32/cfbseg.c | 2
cfb32/cfbsolidC.c | 2
cfb32/cfbsolidG.c | 2
cfb32/cfbsolidX.c | 2
cfb32/cfbtile32C.c | 2
cfb32/cfbtile32G.c | 2
cfb32/cfbtileoddC.c | 2
cfb32/cfbtileoddG.c | 2
cfb32/cfbzerarcC.c | 2
cfb32/cfbzerarcG.c | 2
cfb32/cfbzerarcX.c | 2
composite/Makefile.in | 327
composite/compalloc.c | 1
composite/compinit.c | 202
composite/compwindow.c | 2
config/Makefile.am | 18
config/Makefile.in | 422
config/config-backends.h | 59
config/config.c | 542
config/dbus-api | 19
config/dbus-core.c | 243
config/dbus.c | 441
config/hal.c | 371
config/x11-input.fdi | 31
configure | 2385
configure.ac | 112
damageext/Makefile.in | 327
dbe/Makefile.in | 330
debian/changelog | 149
debian/control | 132
debian/patches/18_execinfo_configured.patch | 29
debian/patches/41_vbe_filter_less.diff | 46
debian/patches/47_fbdevhw_magic_numbers.diff | 17
debian/patches/48_disable_type1.diff | 67
debian/patches/51_xkb-and-loathing.diff | 46
debian/patches/series | 4
debian/rules | 21
debian/xserver-xorg-core.install | 2
debian/xsfbs/xsfbs.mk | 36
depcomp | 64
dix/Makefile.am | 5
dix/Makefile.in | 335
dix/cursor.c | 22
dix/devices.c | 1
dix/getevents.c | 94
dix/main.c | 28
dix/property.c | 64
doc/Makefile.in | 310
exa/Makefile.in | 330
exa/exa.c | 39
exa/exa_unaccel.c | 37
fb/Makefile.in | 710
fb/fb.h | 34
fb/fballpriv.c | 4
fb/fboverlay.c | 6
fb/fbpict.c | 2
fb/fbscreen.c | 33
hw/Makefile.in | 332
hw/darwin/Makefile.am | 1
hw/darwin/Makefile.in | 833
hw/darwin/bundle/Dutch.lproj/Makefile.in | 308
hw/darwin/bundle/English.lproj/Makefile.in | 308
hw/darwin/bundle/French.lproj/Makefile.in | 308
hw/darwin/bundle/German.lproj/Makefile.in | 308
hw/darwin/bundle/Japanese.lproj/Makefile.in | 307
hw/darwin/bundle/Makefile.in | 344
hw/darwin/bundle/Portuguese.lproj/Makefile.in | 308
hw/darwin/bundle/Spanish.lproj/Makefile.in | 308
hw/darwin/bundle/Swedish.lproj/Makefile.in | 308
hw/darwin/bundle/ko.lproj/Makefile.in | 309
hw/darwin/iokit/Makefile.in | 325
hw/darwin/quartz/Makefile.in | 358
hw/darwin/utils/Makefile.in | 339
hw/dmx/Makefile.in | 400
hw/dmx/config/Makefile.in | 398
hw/dmx/doc/Makefile.in | 301
hw/dmx/examples/Makefile.in | 524
hw/dmx/glxProxy/Makefile.in | 325
hw/dmx/input/Makefile.in | 325
hw/kdrive/Makefile.in | 332
hw/kdrive/ati/Makefile.am | 4
hw/kdrive/ati/Makefile.in | 343
hw/kdrive/chips/Makefile.am | 4
hw/kdrive/chips/Makefile.in | 336
hw/kdrive/ephyr/Makefile.am | 5
hw/kdrive/ephyr/Makefile.in | 337
hw/kdrive/epson/Makefile.am | 4
hw/kdrive/epson/Makefile.in | 336
hw/kdrive/fake/Makefile.am | 4
hw/kdrive/fake/Makefile.in | 336
hw/kdrive/fbdev/Makefile.am | 4
hw/kdrive/fbdev/Makefile.in | 336
hw/kdrive/i810/Makefile.am | 4
hw/kdrive/i810/Makefile.in | 336
hw/kdrive/linux/Makefile.in | 325
hw/kdrive/mach64/Makefile.am | 4
hw/kdrive/mach64/Makefile.in | 338
hw/kdrive/mga/Makefile.am | 4
hw/kdrive/mga/Makefile.in | 336
hw/kdrive/neomagic/Makefile.am | 4
hw/kdrive/neomagic/Makefile.in | 343
hw/kdrive/nvidia/Makefile.am | 4
hw/kdrive/nvidia/Makefile.in | 336
hw/kdrive/pm2/Makefile.am | 4
hw/kdrive/pm2/Makefile.in | 336
hw/kdrive/r128/Makefile.am | 4
hw/kdrive/r128/Makefile.in | 336
hw/kdrive/savage/s3curs.c | 8
hw/kdrive/sdl/Makefile.am | 2
hw/kdrive/sdl/Makefile.in | 332
hw/kdrive/sis300/Makefile.am | 4
hw/kdrive/sis300/Makefile.in | 343
hw/kdrive/smi/Makefile.am | 4
hw/kdrive/smi/Makefile.in | 336
hw/kdrive/src/Makefile.in | 341
hw/kdrive/src/kasync.c | 5
hw/kdrive/src/kdrive.c | 14
hw/kdrive/src/kdrive.h | 3
hw/kdrive/src/kinput.c | 19
hw/kdrive/trio/s3curs.c | 8
hw/kdrive/vesa/Makefile.am | 4
hw/kdrive/vesa/Makefile.in | 336
hw/kdrive/via/Makefile.am | 4
hw/kdrive/via/Makefile.in | 337
hw/vfb/Makefile.in | 367
hw/xfree86/Makefile.am | 8
hw/xfree86/Makefile.in | 397
hw/xfree86/common/Makefile.in | 332
hw/xfree86/common/xf86.h | 16
hw/xfree86/common/xf86Config.c | 44
hw/xfree86/common/xf86Configure.c | 65
hw/xfree86/common/xf86Cursor.c | 10
hw/xfree86/common/xf86Debug.c | 117
hw/xfree86/common/xf86Events.c | 10
hw/xfree86/common/xf86Helper.c | 14
hw/xfree86/common/xf86Init.c | 91
hw/xfree86/common/xf86Mode.c | 6
hw/xfree86/common/xf86Module.h | 2
hw/xfree86/common/xf86Priv.h | 3
hw/xfree86/common/xf86Privstr.h | 3
hw/xfree86/common/xf86Xinput.c | 34
hw/xfree86/common/xf86pciBus.c | 24
hw/xfree86/ddc/Makefile.in | 328
hw/xfree86/ddc/ddcProperty.c | 4
hw/xfree86/dixmods/Makefile.in | 494
hw/xfree86/dixmods/extmod/Makefile.in | 348
hw/xfree86/doc/Makefile.in | 332
hw/xfree86/doc/devel/Makefile.in | 300
hw/xfree86/doc/man/Makefile.in | 310
hw/xfree86/doc/man/xorg.conf.man.pre | 7
hw/xfree86/doc/sgml/Makefile.in | 300
hw/xfree86/dri/Makefile.in | 359
hw/xfree86/dri/dri.c | 209
hw/xfree86/dri/dri.h | 14
hw/xfree86/dri/dristruct.h | 2
hw/xfree86/dri/xf86dri.c | 11
hw/xfree86/dummylib/Makefile.in | 349
hw/xfree86/exa/Makefile.in | 349
hw/xfree86/fbdevhw/Makefile.in | 354
hw/xfree86/i2c/Makefile.in | 370
hw/xfree86/int10/Makefile.in | 354
hw/xfree86/int10/generic.c | 62
hw/xfree86/int10/helper_mem.c | 127
hw/xfree86/int10/xf86int10.h | 20
hw/xfree86/loader/Makefile.in | 352
hw/xfree86/loader/xf86sym.c | 21
hw/xfree86/modes/Makefile.in | 328
hw/xfree86/modes/xf86Crtc.c | 10
hw/xfree86/modes/xf86Crtc.h | 12
hw/xfree86/modes/xf86Cursors.c | 116
hw/xfree86/modes/xf86EdidModes.c | 5
hw/xfree86/modes/xf86RandR12.c | 5
hw/xfree86/modes/xf86Rotate.c | 378
hw/xfree86/os-support/Makefile.in | 369
hw/xfree86/os-support/bsd/Makefile.in | 400
hw/xfree86/os-support/bus/Makefile.in | 330
hw/xfree86/os-support/bus/altixPCI.c | 142
hw/xfree86/os-support/bus/linuxPci.c | 60
hw/xfree86/os-support/hurd/Makefile.in | 381
hw/xfree86/os-support/hurd/hurd_bell.c | 30
hw/xfree86/os-support/hurd/hurd_io.c | 131
hw/xfree86/os-support/hurd/hurd_kbd.c | 176
hw/xfree86/os-support/linux/Makefile.in | 405
hw/xfree86/os-support/linux/int10/linux.c | 21
hw/xfree86/os-support/linux/lnx.h | 1
hw/xfree86/os-support/linux/lnx_axp.c | 4
hw/xfree86/os-support/linux/lnx_bell.c | 30
hw/xfree86/os-support/lynxos/Makefile.in | 300
hw/xfree86/os-support/misc/Makefile.in | 327
hw/xfree86/os-support/sco/Makefile.in | 300
hw/xfree86/os-support/solaris/Makefile.am | 10
hw/xfree86/os-support/solaris/Makefile.in | 424
hw/xfree86/os-support/sysv/Makefile.in | 300
hw/xfree86/os-support/usl/Makefile.in | 300
hw/xfree86/parser/Makefile.in | 340
hw/xfree86/rac/Makefile.in | 328
hw/xfree86/ramdac/Makefile.in | 328
hw/xfree86/ramdac/xf86BitOrder.c | 2
hw/xfree86/scanpci/Makefile.in | 343
hw/xfree86/scanpci/extrapci.ids | 22
hw/xfree86/scanpci/pci.ids | 1478
hw/xfree86/scanpci/xf86PciData.c | 2
hw/xfree86/scanpci/xf86PciStdIds.h | 9210 +++
hw/xfree86/shadowfb/Makefile.in | 342
hw/xfree86/utils/Makefile.in | 332
hw/xfree86/utils/cvt/Makefile.in | 357
hw/xfree86/utils/cvt/cvt.man.pre | 2
hw/xfree86/utils/gtf/Makefile.in | 346
hw/xfree86/utils/gtf/gtf.man.pre | 2
hw/xfree86/utils/ioport/Makefile.in | 342
hw/xfree86/utils/kbd_mode/Makefile.in | 354
hw/xfree86/utils/pcitweak/Makefile.in | 346
hw/xfree86/utils/scanpci/Makefile.in | 346
hw/xfree86/utils/xorgcfg/Makefile.in | 531
hw/xfree86/utils/xorgconfig/Makefile.in | 355
hw/xfree86/vbe/Makefile.in | 342
hw/xfree86/vgahw/Makefile.in | 342
hw/xfree86/x86emu/Makefile.in | 326
hw/xfree86/xaa/Makefile.in | 342
hw/xfree86/xaa/l-xaaBitmap.c | 2
hw/xfree86/xaa/l-xaaStipple.c | 2
hw/xfree86/xaa/l-xaaTEGlyph.c | 2
hw/xfree86/xaa/l3-xaaBitmap.c | 3
hw/xfree86/xaa/l3-xaaStipple.c | 3
hw/xfree86/xaa/lf-xaaBitmap.c | 3
hw/xfree86/xaa/lf-xaaStipple.c | 3
hw/xfree86/xaa/lf-xaaTEGlyph.c | 3
hw/xfree86/xaa/lf3-xaaBitmap.c | 4
hw/xfree86/xaa/lf3-xaaStipple.c | 4
hw/xfree86/xaa/m-xaaBitmap.c | 2
hw/xfree86/xaa/m-xaaStipple.c | 2
hw/xfree86/xaa/m-xaaTEGlyph.c | 2
hw/xfree86/xaa/m3-xaaBitmap.c | 3
hw/xfree86/xaa/m3-xaaStipple.c | 3
hw/xfree86/xaa/mf-xaaBitmap.c | 3
hw/xfree86/xaa/mf-xaaStipple.c | 3
hw/xfree86/xaa/mf-xaaTEGlyph.c | 3
hw/xfree86/xaa/mf3-xaaBitmap.c | 4
hw/xfree86/xaa/mf3-xaaStipple.c | 4
hw/xfree86/xaa/s-xaaDashLine.c | 2
hw/xfree86/xaa/s-xaaLine.c | 2
hw/xfree86/xf1bpp/Makefile.am | 10
hw/xfree86/xf1bpp/Makefile.in | 352
hw/xfree86/xf4bpp/Makefile.in | 342
hw/xfree86/xf4bpp/mfbseg.c | 2
hw/xfree86/xf4bpp/ppcGCstr.h | 22
hw/xfree86/xf8_16bpp/Makefile.in | 342
hw/xfree86/xf8_32bpp/Makefile.in | 342
hw/xfree86/xf8_32bpp/cfbgc32.c | 2
hw/xfree86/xf8_32bpp/cfbgc8.c | 2
hw/xgl/Makefile.in | 407
hw/xgl/egl/Makefile.in | 409
hw/xgl/egl/module/Makefile.in | 338
hw/xgl/glx/Makefile.in | 360
hw/xgl/glx/module/Makefile.in | 342
hw/xgl/glxext/Makefile.in | 360
hw/xgl/glxext/module/Makefile.in | 343
hw/xnest/Makefile.in | 367
hw/xprint/Makefile.in | 459
hw/xprint/config/C/Makefile.in | 332
hw/xprint/config/C/print/Makefile.in | 339
hw/xprint/config/C/print/attributes/Makefile.in | 304
hw/xprint/config/C/print/ddx-config/Makefile.in | 332
hw/xprint/config/C/print/ddx-config/raster/Makefile.in | 304
hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in | 304
hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in | 336
hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in | 299
hw/xprint/config/C/print/models/GSdefault/Makefile.in | 304
hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in | 336
hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in | 304
hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in | 336
hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in | 299
hw/xprint/config/C/print/models/HPLJ4family/Makefile.in | 336
hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in | 304
hw/xprint/config/C/print/models/Makefile.in | 332
hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in | 307
hw/xprint/config/C/print/models/PSdefault/Makefile.in | 336
hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in | 303
hw/xprint/config/C/print/models/PSspooldir/Makefile.in | 307
hw/xprint/config/C/print/models/SPSPARC2/Makefile.in | 336
hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in | 299
hw/xprint/config/Makefile.in | 336
hw/xprint/config/en_US/Makefile.in | 332
hw/xprint/config/en_US/print/Makefile.in | 332
hw/xprint/config/en_US/print/attributes/Makefile.in | 304
hw/xprint/doc/Makefile.in | 305
hw/xprint/dpmsstubs-wrapper.c | 1
hw/xprint/etc/Makefile.in | 332
hw/xprint/etc/Xsession.d/Makefile.in | 304
hw/xprint/etc/init.d/Makefile.in | 302
hw/xprint/etc/profile.d/Makefile.in | 300
hw/xprint/miinitext-wrapper.c | 1
hw/xprint/pcl-mono/Makefile.in | 436
hw/xprint/pcl/Makefile.in | 436
hw/xprint/pcl/PclInit.c | 32
hw/xprint/ps/Makefile.in | 327
hw/xprint/raster/Makefile.in | 327
hw/xwin/Makefile.in | 390
hw/xwin/winprefslex.c | 1826
hw/xwin/winprefsyacc.c | 2002
hw/xwin/winprefsyacc.h | 105
include/Makefile.am | 1
include/Makefile.in | 323
include/dix-config.h.in | 8
include/dix.h | 3
include/do-not-use-config.h.in | 8
include/hotplug.h | 49
include/inputstr.h | 1
include/xorg-server.h.in | 3
install-sh | 348
ltmain.sh | 233
mfb/Makefile.in | 330
mfb/mfbbltC.c | 2
mfb/mfbbltCI.c | 2
mfb/mfbbltG.c | 2
mfb/mfbbltO.c | 2
mfb/mfbbltX.c | 2
mfb/mfbigbblak.c | 3
mfb/mfbigbwht.c | 3
mfb/mfbpablack.c | 5
mfb/mfbpainv.c | 5
mfb/mfbpawhite.c | 5
mfb/mfbpgbblak.c | 3
mfb/mfbpgbinv.c | 3
mfb/mfbpgbwht.c | 3
mfb/mfbplyblack.c | 4
mfb/mfbplyinv.c | 4
mfb/mfbplywhite.c | 4
mfb/mfbseg.c | 2
mfb/mfbteblack.c | 4
mfb/mfbtewhite.c | 4
mfb/mfbtileC.c | 2
mfb/mfbtileG.c | 2
mi/Makefile.in | 330
miext/Makefile.in | 332
miext/cw/Makefile.in | 327
miext/damage/Makefile.in | 330
miext/rootless/Makefile.in | 360
miext/rootless/accel/Makefile.in | 327
miext/rootless/safeAlpha/Makefile.in | 327
miext/shadow/Makefile.in | 330
missing | 61
os/Makefile.am | 6
os/Makefile.in | 344
randr/Makefile.in | 330
randr/randrstr.h | 5
randr/rrcrtc.c | 4
randr/rrinfo.c | 2
randr/rroutput.c | 9
randr/rrscreen.c | 9
record/Makefile.in | 327
render/Makefile.in | 330
render/picture.c | 2
xfixes/Makefile.in | 327
xkb/Makefile.in | 333
xkb/xkbUtils.c | 5
445 files changed, 58513 insertions(+), 59675 deletions(-)
New commits:
commit 48e8c7915fa1a6d0665f9f7ec98d6e4d8bb30901
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Aug 1 23:39:04 2007 +0200
Yet another dropped patch.
diff --git a/debian/changelog b/debian/changelog
index 557024a..3e63c61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xorg-server (2:1.3.99.0-1) UNRELEASED; urgency=low
+ 08_s390_servermd.diff
+ 12_security_policy_in_etc.diff
+ 16_s390_fix.diff
+ + 18_execinfo_configured.patch
+ 23_kfreebsd_support.diff
+ 24_hurd_ioperm_fix.diff
+ 32_disable_sparc_pci_bridge.diff
diff --git a/debian/patches/18_execinfo_configured.patch
b/debian/patches/18_execinfo_configured.patch
deleted file mode 100644
index 53b3c47..0000000
--- a/debian/patches/18_execinfo_configured.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Daniel Stone <[EMAIL PROTECTED]>
-Date: Sat, 12 Aug 2006 16:25:06 +0000 (+0300)
-Subject: configure.ac: fix execinfo.h test (Debian #363218)
-X-Git-Url:
http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=5a3488ccac8e5dabd9fc98bc41ef178ead1b2faf
-
-configure.ac: fix execinfo.h test (Debian #363218)
-Define HAVE_EXECINFO_H as well as HAVE_BACKTRACE, when we find execinfo.h.
----
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -174,6 +174,7 @@ dnl glibc backtrace support check (hw/xf
- AC_CHECK_HEADER([execinfo.h],[
- AC_CHECK_LIB(c, backtrace, [
- AC_DEFINE(HAVE_BACKTRACE, 1, [Has backtrace support])
-+ AC_DEFINE(HAVE_EXECINFO_H, 1, [Have execinfo.h])
- ])]
- )
-
---- a/include/xorg-config.h.in
-+++ b/include/xorg-config.h.in
-@@ -109,4 +109,7 @@
- /* Name of the period field in struct kbd_repeat */
- #undef LNX_KBD_PERIOD_NAME
-
-+/* Have execinfo.h */
-+#undef HAVE_EXECINFO_H
-+
- #endif /* _XORG_CONFIG_H_ */
commit 2ca8c7af67c5e1f94f7875f46d8d5383ed13668c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Aug 1 23:35:51 2007 +0200
Disable the xprint* and xdmx* packages.
hw/xprint and hw/dmx fail to build. They need to be updated for the
hal/dbus changes.
diff --git a/debian/changelog b/debian/changelog
index aec3f4b..557024a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,11 +43,12 @@ xorg-server (2:1.3.99.0-1) UNRELEASED; urgency=low
rebuilt).
* Bump build-dep on compositeproto to >= 0.4.
* Install the upstream changelog.
+ * Disable the xprint and dmx DDX for now, they fail to build.
[ Drew Parsons ]
* Update Xprint build to include pixman.
- -- Julien Cristau <[EMAIL PROTECTED]> Wed, 01 Aug 2007 21:32:18 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Wed, 01 Aug 2007 23:33:41 +0200
xorg-server (2:1.3.0.0.dfsg-12) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 4fec2f3..7cf865b 100644
--- a/debian/control
+++ b/debian/control
@@ -85,40 +85,40 @@ Description: X.Org X server -- development files
This module can be found as the module 'xserver/xorg' at
:pserver:[EMAIL PROTECTED]:/cvs/xorg
-Package: xdmx
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Distributed Multihead X server
- Xdmx is a proxy X server that uses one or more other X servers as its
- display device(s). It provides multi-head X functionality for displays that
- might be located on different machines. Xdmx functions as a front-end X
server
- that acts as a proxy to a set of back-end X servers. All of the visible
- rendering is passed to the back-end X servers. Clients connect to the Xdmx
- front-end, and everything appears as it would in a regular multi-head
- configuration. If Xinerama is enabled (e.g., with +xinerama on the command
- line), the clients see a single large screen.
- .
- More information about X.Org can be found at:
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'xserver/xorg' at
- :pserver:[EMAIL PROTECTED]:/cvs/xorg
-
-Package: xdmx-tools
-Architecture: any
-Depends: xdmx, ${shlibs:Depends}, ${misc:Depends}
-Replaces: xdmx (<= 2:1.1.1-10)
-Description: Distributed Multihead X tools
- This package provides a collection of tools used for administration of
- the Xdmx server; see the xdmx package for more information.
- .
- More information about X.Org can be found at:
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'xserver/xorg' at
- :pserver:[EMAIL PROTECTED]:/cvs/xorg
+#Package: xdmx
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}
+#Description: Distributed Multihead X server
+# Xdmx is a proxy X server that uses one or more other X servers as its
+# display device(s). It provides multi-head X functionality for displays that
+# might be located on different machines. Xdmx functions as a front-end X
server
+# that acts as a proxy to a set of back-end X servers. All of the visible
+# rendering is passed to the back-end X servers. Clients connect to the Xdmx
+# front-end, and everything appears as it would in a regular multi-head
+# configuration. If Xinerama is enabled (e.g., with +xinerama on the command
+# line), the clients see a single large screen.
+# .
+# More information about X.Org can be found at:
+# <URL:http://xorg.freedesktop.org>
+# <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+# .
+# This module can be found as the module 'xserver/xorg' at
+# :pserver:[EMAIL PROTECTED]:/cvs/xorg
+#
+#Package: xdmx-tools
+#Architecture: any
+#Depends: xdmx, ${shlibs:Depends}, ${misc:Depends}
+#Replaces: xdmx (<= 2:1.1.1-10)
+#Description: Distributed Multihead X tools
+# This package provides a collection of tools used for administration of
+# the Xdmx server; see the xdmx package for more information.
+# .
+# More information about X.Org can be found at:
+# <URL:http://xorg.freedesktop.org>
+# <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+# .
+# This module can be found as the module 'xserver/xorg' at
+# :pserver:[EMAIL PROTECTED]:/cvs/xorg
Package: xnest
Architecture: any
@@ -175,36 +175,36 @@ Description: Next Generation Nested X Server
result it supports newer extensions than xnest, including render and
composite.
-Package: xprint
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xprint-common, libxfont1 (>=
1:1.1)
-Recommends: xprint-utils
-Conflicts: xprt (<= 4.3.0.dfsg.1-10)
-Description: Xprint - the X11 print system (binary)
- Xprint is an advanced printing system which enables X11 applications
- to use devices like printers, FAX or create documents in formats like
- PostScript, PDF, PCL, etc.
- .
- This package provides Xprt, the Xprint server compiled from
- xprint.mozdev.org, an X.org subproject. Xprint provides superior support
- for printing from mozilla, including non-latin characters and MathML.
- TrueType fonts are supported.
- .
- Xprint uses ttf2pt1 internally for some font support.
-
-Package: xprint-common
-Architecture: all
-Depends: xbase-clients, xfonts-encodings, x11-common (>= 1:7.0.12),
${shlibs:Depends}, ${misc:Depends}
-Recommends: xprint, xfonts-base
-Conflicts: xprt-common
-Replaces: xprt-common
-Description: Xprint - the X11 print system (configuration files)
- Xprint is an advanced printing system which enables X11 applications
- to use devices like printers, FAX or create documents in formats like
- PostScript, PDF, PCL, etc.
- .
- This package provides the configuration and postscript definition files
- required to run Xprt, the Xprint server. Xprt is provided by xprint.
+#Package: xprint
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}, xprint-common, libxfont1 (>=
1:1.1)
+#Recommends: xprint-utils
+#Conflicts: xprt (<= 4.3.0.dfsg.1-10)
+#Description: Xprint - the X11 print system (binary)
+# Xprint is an advanced printing system which enables X11 applications
+# to use devices like printers, FAX or create documents in formats like
+# PostScript, PDF, PCL, etc.
+# .
+# This package provides Xprt, the Xprint server compiled from
+# xprint.mozdev.org, an X.org subproject. Xprint provides superior support
+# for printing from mozilla, including non-latin characters and MathML.
+# TrueType fonts are supported.
+# .
+# Xprint uses ttf2pt1 internally for some font support.
+#
+#Package: xprint-common
+#Architecture: all
+#Depends: xbase-clients, xfonts-encodings, x11-common (>= 1:7.0.12),
${shlibs:Depends}, ${misc:Depends}
+#Recommends: xprint, xfonts-base
+#Conflicts: xprt-common
+#Replaces: xprt-common
+#Description: Xprint - the X11 print system (configuration files)
+# Xprint is an advanced printing system which enables X11 applications
+# to use devices like printers, FAX or create documents in formats like
+# PostScript, PDF, PCL, etc.
+# .
+# This package provides the configuration and postscript definition files
+# required to run Xprt, the Xprint server. Xprt is provided by xprint.
Package: xserver-xorg-core-dbg
Architecture: any
diff --git a/debian/rules b/debian/rules
index 87a0278..1739f1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,13 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
+BUILD_XPRINT = false
+ifeq ($(BUILD_XPRINT), true)
+ confflags += --enable-xprint
+else
+ confflags += --disable-xprint
+endif
+
INSTALL=/usr/bin/install
# disable-static is so we don't get libfoo.a for modules. now if only we could
@@ -39,12 +46,11 @@ confflags += --disable-static \
--with-serverconfig-path=/etc/X11/xserver \
--with-rgb-path=/etc/X11/rgb \
--enable-xtrap \
- --enable-dmx \
+ --disable-dmx \
--enable-vfb \
--enable-kdrive \
--enable-xephyr \
--disable-lbx \
- --enable-xprint \
--enable-freetype \
--disable-xorgconfig \
--disable-xorgcfg \
@@ -141,9 +147,11 @@ binary-arch: build install
$(INSTALL) -m 755 debian/xserver-xorg-core.bug.script
debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
dh_installdebconf -a
dh_installman -a
+ifeq ($(BUILD_XPRINT), true)
$(INSTALL) -m 644 $(CURDIR)/debian/xprint-overrides
$(CURDIR)/debian/xprint/usr/share/lintian/overrides/xprint
# xprint docs are linked to xprint-common
rm -rf debian/xprint/usr/share/doc/xprint
+endif
dh_link -a
dh_strip -a --exclude=usr/lib/xorg/modules \
@@ -166,6 +174,7 @@ binary-indep: build install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
dh_install -i --sourcedir=debian/tmp --list-missing -Xusr/share/man
-Xusr/include/xorg -Xusr/share/aclocal -Xusr/lib/xorg/modules
-Xusr/lib/pkgconfig/xorg-server.pc -Xusr/bin -XSecurityPolicy -Xvar/lib/xkb
-Xusr/lib/X11/Cards -Xusr/lib/X11/Options
+ifeq ($(BUILD_XPRINT), true)
$(INSTALL) -m 644 $(CURDIR)/debian/xprint-common-overrides
$(CURDIR)/debian/xprint-common/usr/share/lintian/overrides/xprint-common
# split Xprint config files so font files do not land in /etc
# (for xprint-common only)
@@ -176,6 +185,7 @@ binary-indep: build install
# dh_install cannot rename files, sigh
$(INSTALL) -m 644 $(CURDIR)/debian/xprint-common.default
$(CURDIR)/debian/xprint-common/etc/default/xprint
dh_installinit -p xprint-common --name=xprint
+endif
dh_installdocs -i
dh_installchangelogs -i ChangeLog
commit e33277f11bb8c319b1cb63cd6ad47be9ab88a420
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Aug 1 22:03:53 2007 +0200
Changelog and build-deps update.
diff --git a/debian/changelog b/debian/changelog
index a69520c..aec3f4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,49 +1,53 @@
-xorg-server (2:1.3.99.0~git20070703-1) UNRELEASED; urgency=low
+xorg-server (2:1.3.99.0-1) UNRELEASED; urgency=low
- [ Julien Cristau ]
- * New upstream snapshot.
- + Update patches:
- - 04_read_rom_in_chunks.diff refreshed;
- - 05_module_defaults.diff dropped (applied upstream);
- - 07_xorgconf_manpage_overhaul.diff updated;
- - 09_debian_xserver_rtff.diff disabled (doesn't apply, and isn't even
- used AFAICS;
- - 12_security_policy_in_etc.diff updated;
- - 13_debian_add_xkbpath_env_variable.diff refreshed;
- - 21_glx_align_fixes.patch updated;
- - 23_kfreebsd_support.diff updated;
- - 32_disable_sparc_pci_bridge.diff dropped (applied upstream);
- - 34_xorg.conf_man_typos.patch dropped (applied upstream);
- - 39_alpha_build_flags.patch dropped (applied upstream);
- - 44_fedora-xephyr-keysym-madness.diff dropped (different fix applied
- upstream);
- - 45_CVE-2007-2437.diff dropped (applied upstream);
- - 46_export-ramdac-symbols.diff refreshed;
- - 94_use_default_font_path.diff dropped (applied upstream).
- + Add build-dep on x11proto-input-dev (>= 1.4.2), libpixman-dev
- (>= 0.9.0), bump build-dep on mesa-swx11-source to >= 6.5.3.
- + Bump serverminver to this version, videoabiver to 1.9, inputabiver to
- 0.9 (so this doesn't clash with a release and drivers have to be
- rebuilt).
- + Bump build-dep on compositeproto to >= 0.4.
- * Install the upstream changelog.
+ [ Julien Cristau, David Nusinow ]
+ * New upstream release candidate.
- [ David Nusinow ]
* Remove patches that were pushed upstream
+ 03_xnest_manpage_overhaul.diff
+ 04_read_rom_in_chunks.diff
+ + 05_module_defaults.diff
+ 07_xorgconf_manpage_overhaul.diff
+ 08_s390_servermd.diff
+ 12_security_policy_in_etc.diff
+ 16_s390_fix.diff
+ 23_kfreebsd_support.diff
+ 24_hurd_ioperm_fix.diff
+ + 32_disable_sparc_pci_bridge.diff
+ + 39_alpha_build_flags.patch
+ + 40_consolidate_portPriv_pDraw_assignments.diff
+ + 42_only_run_special_key_behaviours_on_non-XKB.diff
+ + 44_fedora-xephyr-keysym-madness.diff (different fix applied upstream)
+ + 45_CVE-2007-2437.diff
+ 46_export-ramdac-symbols.diff
+ + 50_alpha_no_include_asm_pci.h.diff
+ + 94_use_default_font_path.diff
+
+ * Update other patches:
+ + 09_debian_xserver_rtff.diff disabled (doesn't apply, and isn't even
+ used AFAICS;
+ + 11_define_XFree86Server.diff dropped, to be fixed in drivers instead;
+ + 13_debian_add_xkbpath_env_variable.diff refreshed;
+ + 21_glx_align_fixes.patch updated;
+ + 43_xephyr_crash_at_exit.diff dropped (doesn't apply);
+ + 47_fbdevhw_magic_numbers.diff disabled for now;
+ + 48_disable_type1.diff disabled for now;
+ + 51_xkb-and-loathing.diff disabled for now.
+
+ [ Julien Cristau ]
+ * Add build-dep on x11proto-input-dev (>= 1.4.2), libpixman-dev
+ (>= 0.9.0), libdbus-1-dev, libhal-dev.
+ * Bump build-dep on mesa-swx11-source to >> 7.0.1~rc2-1.
+ * Bump serverminver to this version, videoabiver to 1.9, inputabiver to
+ 0.9 (so this doesn't clash with a release and drivers have to be
+ rebuilt).
+ * Bump build-dep on compositeproto to >= 0.4.
+ * Install the upstream changelog.
[ Drew Parsons ]
* Update Xprint build to include pixman.
- -- Julien Cristau <[EMAIL PROTECTED]> Wed, 01 Aug 2007 15:28:09 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Wed, 01 Aug 2007 21:32:18 +0200
xorg-server (2:1.3.0.0.dfsg-12) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 169673d..4fec2f3 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 4.0.0), pkg-config, bison, flex,
libxkbfile-dev (>= 1:0.99.1-1), libpixman-dev (>= 0.9.2),
x11proto-xf86dri-dev, libdrm-dev (>= 2.3.0) [!hurd-i386],
x11proto-print-dev, libfreetype6-dev, xfonts-utils,
- mesa-swx11-source (>> 6.5.3-1),
+ mesa-swx11-source (>> 7.0.1~rc2-1),
x11proto-gl-dev (>= 1.4.8), libgl1-mesa-dev (>= 6.5.1),
libxmuu-dev (>= 1:0.99.1-1), libxext-dev (>= 1:0.99.1-1),
libx11-dev (>= 1:0.99.2-1), libxrender-dev (>= 1:0.9.0-1),
@@ -30,7 +30,7 @@ Build-Depends: debhelper (>= 4.0.0), pkg-config, bison, flex,
libxpm-dev (>= 1:3.5.3-1), libxaw7-dev (>= 1:0.99.1-1),
libxt-dev (>= 1:0.99.1-1), libxmu-dev (>= 1:0.99.1-1),
libxtst-dev (>= 1:0.99.1-1), libxres-dev (>= 1:0.99.1-1),
- libxfixes-dev (>= 1:3.0.0)
+ libxfixes-dev (>= 1:3.0.0), libdbus-1-dev, libhal-dev
Build-Conflicts: xlibs-static-dev
Standards-Version: 3.7.2.0
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
commit 4ad6802086029c4a1dd3f5ce0ed96d19dbcfd8de
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Aug 1 17:04:04 2007 +0200
Delete generated files.
These are generated by configure, so shouldn't be in the source package.
diff --git a/afb/afbbltC.c b/afb/afbbltC.c
deleted file mode 100644
index e85a8a4..0000000
--- a/afb/afbbltC.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MROP Mcopy
-#include "./afbblt.c"
diff --git a/afb/afbbltCI.c b/afb/afbbltCI.c
deleted file mode 100644
index cfb282a..0000000
--- a/afb/afbbltCI.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MROP McopyInverted
-#include "./afbblt.c"
diff --git a/afb/afbbltG.c b/afb/afbbltG.c
deleted file mode 100644
index 110e103..0000000
--- a/afb/afbbltG.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MROP 0
-#include "./afbblt.c"
diff --git a/afb/afbbltO.c b/afb/afbbltO.c
deleted file mode 100644
index 4caf990..0000000
--- a/afb/afbbltO.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MROP Mor
-#include "./afbblt.c"
diff --git a/afb/afbbltX.c b/afb/afbbltX.c
deleted file mode 100644
index 34c3d9e..0000000
--- a/afb/afbbltX.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MROP Mxor
-#include "./afbblt.c"
diff --git a/afb/afbseg.c b/afb/afbseg.c
deleted file mode 100644
index 089bd6b..0000000
--- a/afb/afbseg.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define POLYSEGMENT
-#include "./afbline.c"
diff --git a/afb/afbtileC.c b/afb/afbtileC.c
deleted file mode 100644
index 7bdf2d4..0000000
--- a/afb/afbtileC.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MROP Mcopy
-#include "./afbtile.c"
diff --git a/afb/afbtileG.c b/afb/afbtileG.c
deleted file mode 100644
index 66ff7f8..0000000
--- a/afb/afbtileG.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MROP 0
-#include "./afbtile.c"
diff --git a/cfb/cfb8lineCO.c b/cfb/cfb8lineCO.c
deleted file mode 100644
index 4c7b4ba..0000000
--- a/cfb/cfb8lineCO.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define RROP GXcopy
-#include "../cfb/cfb8line.c"
diff --git a/cfb/cfb8lineCP.c b/cfb/cfb8lineCP.c
deleted file mode 100644
index 40f1ee8..0000000
--- a/cfb/cfb8lineCP.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define RROP GXcopy
-#define PREVIOUS
-#include "../cfb/cfb8line.c"
diff --git a/cfb/cfb8lineG.c b/cfb/cfb8lineG.c
deleted file mode 100644
index 4750247..0000000
--- a/cfb/cfb8lineG.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define RROP GXset
-#include "../cfb/cfb8line.c"
diff --git a/cfb/cfb8lineX.c b/cfb/cfb8lineX.c
deleted file mode 100644
index 50188f0..0000000
--- a/cfb/cfb8lineX.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define RROP GXxor
-#include "../cfb/cfb8line.c"
diff --git a/cfb/cfb8segC.c b/cfb/cfb8segC.c
deleted file mode 100644
index 0a2f191..0000000
--- a/cfb/cfb8segC.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define RROP GXcopy
-#define POLYSEGMENT
-#include "../cfb/cfb8line.c"
diff --git a/cfb/cfb8segCS.c b/cfb/cfb8segCS.c
deleted file mode 100644
index 89fbd96..0000000
--- a/cfb/cfb8segCS.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#define RROP GXcopy
-#define POLYSEGMENT
-#define WIDTH_SHIFT
-#include "../cfb/cfb8line.c"
diff --git a/cfb/cfb8segX.c b/cfb/cfb8segX.c
deleted file mode 100644
index 586e06e..0000000
--- a/cfb/cfb8segX.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define RROP GXxor
-#define POLYSEGMENT
-#include "../cfb/cfb8line.c"
diff --git a/cfb/cfb8setG.c b/cfb/cfb8setG.c
deleted file mode 100644
index 702a040..0000000
--- a/cfb/cfb8setG.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define RROP GXset
-#define POLYSEGMENT
-#include "../cfb/cfb8line.c"
diff --git a/cfb/cfbbltC.c b/cfb/cfbbltC.c
deleted file mode 100644
index 4e4a455..0000000
--- a/cfb/cfbbltC.c
+++ /dev/null
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
