xorg-server: Changes to 'ubuntu'
ChangeLog | 152 ++++++++++++++
configure.ac | 4
debian/changelog | 46 +++-
debian/control | 23 +-
debian/copyright | 234 ++--------------------
debian/local/xvfb-run | 6
debian/patches/100_xserver_exa_force_greedy.patch | 16 -
debian/patches/142_psb_auto.patch | 12 -
debian/rules | 11 -
debian/xserver-common.install | 2
debian/xserver-xorg-core.install | 1
debian/xserver-xorg-core.postinst.in | 22 ++
debian/xserver-xorg-core.postrm.in | 13 +
debian/xserver-xorg-core.preinst.in | 21 +
hw/xfree86/ddc/interpret_edid.c | 41 +++
15 files changed, 353 insertions(+), 251 deletions(-)
New commits:
commit 7b731e0384113ab8151e651e80ef736808cfb549
Author: Loïc Minier <lool@dooz.org>
Date: Tue Oct 14 23:26:14 2008 +0200
Refresh patch 100_xserver_exa_force_greedy to apply cleanly.
diff --git a/debian/changelog b/debian/changelog
index 85d0f5d..1cc08a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.5.2-1ubuntu1) intrepid; urgency=low
* Merge from debian-experimental.
* Update patch 142_psb_auto to try vesa if psb fails; thanks Oliver Grawert.
+ * Refresh patch 100_xserver_exa_force_greedy to apply cleanly.
-- Loic Minier <lool@dooz.org> Tue, 14 Oct 2008 23:03:06 +0200
diff --git a/debian/patches/100_xserver_exa_force_greedy.patch b/debian/patches/100_xserver_exa_force_greedy.patch
index a9aac7c..24dd770 100644
--- a/debian/patches/100_xserver_exa_force_greedy.patch
+++ b/debian/patches/100_xserver_exa_force_greedy.patch
@@ -1,8 +1,6 @@
-Index: xorg-server/exa/exa.c
-===================================================================
---- xorg-server.orig/exa/exa.c 2008-06-18 10:28:15.000000000 +0300
-+++ xorg-server/exa/exa.c 2008-06-18 12:07:25.000000000 +0300
-@@ -837,6 +837,11 @@
+--- xorg-server.orig/exa/exa.c 2008-10-14 23:24:44.000000000 +0200
++++ xorg-server/exa/exa.c 2008-10-14 23:25:52.000000000 +0200
+@@ -882,6 +882,11 @@
dixSetPrivate(&pScreen->devPrivates, exaScreenPrivateKey, pExaScr);
pExaScr->migration = ExaMigrationAlways;
@@ -14,11 +12,9 @@ Index: xorg-server/exa/exa.c
exaDDXDriverInit(pScreen);
-Index: xorg-server/exa/exa.h
-===================================================================
---- xorg-server.orig/exa/exa.h 2008-06-18 10:28:16.000000000 +0300
-+++ xorg-server/exa/exa.h 2008-06-18 12:07:25.000000000 +0300
-@@ -735,6 +735,13 @@
+--- xorg-server.orig/exa/exa.h 2008-10-14 23:24:44.000000000 +0200
++++ xorg-server/exa/exa.h 2008-10-14 23:25:52.000000000 +0200
+@@ -737,6 +737,13 @@
#define EXA_TWO_BITBLT_DIRECTIONS (1 << 2)
/**
commit ec1d55bc7640c28e022dade8d0dcfde6886690f3
Author: Loïc Minier <lool@dooz.org>
Date: Tue Oct 14 23:25:47 2008 +0200
Update patch 142_psb_auto to try vesa if psb fails; thanks Oliver Grawert.
diff --git a/debian/changelog b/debian/changelog
index 0e79a53..85d0f5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.5.2-1ubuntu1) intrepid; urgency=low
* Merge from debian-experimental.
+ * Update patch 142_psb_auto to try vesa if psb fails; thanks Oliver Grawert.
-- Loic Minier <lool@dooz.org> Tue, 14 Oct 2008 23:03:06 +0200
diff --git a/debian/patches/142_psb_auto.patch b/debian/patches/142_psb_auto.patch
index 4e097d6..c3a85c5 100644
--- a/debian/patches/142_psb_auto.patch
+++ b/debian/patches/142_psb_auto.patch
@@ -5,11 +5,9 @@ in style to the savage driver section.
Bryce Harrington 23-Aug-2007
-Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2008-09-26 22:33:11.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2008-09-26 22:33:11.000000000 +0300
-@@ -166,11 +166,16 @@
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2008-10-14 23:22:23.000000000 +0200
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2008-10-14 23:23:00.000000000 +0200
+@@ -166,11 +166,18 @@
case 0x102c: driverList[0] = "chips"; break;
case 0x1013: driverList[0] = "cirrus"; break;
case 0x8086:
@@ -23,7 +21,9 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+ case 0x00d1: case 0x7800:
+ driverList[0] = "i740"; break;
+ case 0x8108:
-+ driverList[0] = "psb"; break;
++ driverList[0] = "psb";
++ driverList[1] = "vesa";
++ break;
+ default:
+ driverList[0] = "intel";
+ driverList[1] = "i810";
commit d295815a798e4c73b23ed0930ed0e959d327c36c
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 11 20:20:31 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 4924cd2..76e2ffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.5.2-1) UNRELEASED; urgency=low
+xorg-server (2:1.5.2-1) experimental; urgency=low
* New upstream bugfix release.
* debian/rules: define PCI_TXT_IDS_DIR to unbreak the pci id matching using
@@ -12,7 +12,7 @@ xorg-server (2:1.5.2-1) UNRELEASED; urgency=low
* Remove obsolete conffile /etc/X11/xserver/SecurityPolicy on upgrades.
* Merge changes from 2:1.4.2-7.
- -- Julien Cristau <jcristau@debian.org> Thu, 25 Sep 2008 18:50:19 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Oct 2008 20:20:28 +0200
xorg-server (2:1.5.1-1) experimental; urgency=low
commit 67dcdfd59390d8f4c49eed0224c5a5c8684bec05
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 11 03:49:19 2008 +0200
Also remove /etc/X11/xserver if it's empty
diff --git a/debian/xserver-xorg-core.postinst.in b/debian/xserver-xorg-core.postinst.in
index fca5608..d047bb1 100644
--- a/debian/xserver-xorg-core.postinst.in
+++ b/debian/xserver-xorg-core.postinst.in
@@ -11,6 +11,7 @@ case "$1" in
configure)
if dpkg --compare-versions "$2" lt-nl 2:1.5.2-1; then
remove_conffile_commit /etc/X11/xserver/SecurityPolicy
+ rmdir /etc/X11/xserver || true
fi
esac
commit 6e9638e4566b041975f6a2a209c0bd8bd9064add
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 11 03:30:51 2008 +0200
Remove obsolete conffile /etc/X11/xserver/SecurityPolicy on upgrades.
diff --git a/debian/changelog b/debian/changelog
index 868a763..8f99cb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xorg-server (2:1.5.2-1) UNRELEASED; urgency=low
/usr/lib/xorg/protocol.txt and the Xserver(1) manpage for now.
* debian/rules: Use filter instead of findstring for noopt in
DEB_BUILD_OPTIONS.
+ * Remove obsolete conffile /etc/X11/xserver/SecurityPolicy on upgrades.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Sep 2008 18:50:19 +0200
diff --git a/debian/xserver-xorg-core.postinst.in b/debian/xserver-xorg-core.postinst.in
new file mode 100644
index 0000000..fca5608
--- /dev/null
+++ b/debian/xserver-xorg-core.postinst.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xserver-xorg-core
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+ configure)
+ if dpkg --compare-versions "$2" lt-nl 2:1.5.2-1; then
+ remove_conffile_commit /etc/X11/xserver/SecurityPolicy
+ fi
+esac
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sw=2 ts=2 tw=80:
diff --git a/debian/xserver-xorg-core.postrm.in b/debian/xserver-xorg-core.postrm.in
index 7d4be1b..19bec1e 100644
--- a/debian/xserver-xorg-core.postrm.in
+++ b/debian/xserver-xorg-core.postrm.in
@@ -7,9 +7,18 @@ THIS_SCRIPT=postrm
#INCLUDE_SHELL_LIB#
-if [ "$1" = "purge" ]; then
+case "$1" in
+abort-install|abort-upgrade)
+ if dpkg --compare-versions "$2" lt-nl "2:1.5.2-1"; then
+ remove_conffile_rollback /etc/X11/xserver/SecurityPolicy
+ fi
+ ;;
+purge)
rm /var/log/Xorg.*.log || true
rm /var/log/Xorg.*.log.old || true
-fi
+ ;;
+esac
#DEBHELPER#
+
+# vim:set ai et sts=2 sw=2 tw=0:
diff --git a/debian/xserver-xorg-core.preinst.in b/debian/xserver-xorg-core.preinst.in
new file mode 100644
index 0000000..c1b84a2
--- /dev/null
+++ b/debian/xserver-xorg-core.preinst.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xserver-xorg-core
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+upgrade|install)
+ if dpkg --compare-versions "$2" lt-nl 2:1.5.2-1; then
+ remove_conffile_lookup xserver-xorg-core /etc/X11/xserver/SecurityPolicy
+ fi
+esac
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sw=2 ts=2 tw=80:
commit 2ac3a730aa1ab59e0ef74d2393722268862a0a0c
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 11 02:55:51 2008 +0200
debian/rules: Use filter instead of findstring for noopt in DEB_BUILD_OPTIONS.
diff --git a/debian/changelog b/debian/changelog
index be877d1..868a763 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xorg-server (2:1.5.2-1) UNRELEASED; urgency=low
it for Xprint.
* Re-introduce the xserver-common package, containing
/usr/lib/xorg/protocol.txt and the Xserver(1) manpage for now.
+ * debian/rules: Use filter instead of findstring for noopt in
+ DEB_BUILD_OPTIONS.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Sep 2008 18:50:19 +0200
diff --git a/debian/rules b/debian/rules
index ee13076..0c808dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
commit 735a92cebaf157b0fd31d7892c259d2d5075eef0
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Oct 10 23:51:14 2008 +0200
update changelogs
diff --git a/ChangeLog b/ChangeLog
index fef4b74..5b7377f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,155 @@
+commit 6dcfa994b0777bf0cabeb71672f13e650b340817
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Oct 10 15:26:32 2008 -0400
+
+ xserver 1.5.2
+
+commit 75504517a30f1bdd593c2a32af81084b59b398a5
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Oct 10 13:41:50 2008 -0400
+
+ EDID: Catch monitors that encode aspect ratio for physical size.
+
+ This is not legal in either EDID 1.3 or 1.4, but hey, when did a little
+ thing like legality stop anyone.
+ (cherry picked from commit 0660dd9d7009147c395b9ea904539f76f55b9a7f)
+
+commit b595b65e54b1e15fbce872fe3719da14cfae5b92
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Oct 9 14:53:29 2008 -0400
+
+ Revert "Array-index based devPrivates implementation."
+
+ This reverts commit 8ef37c194fa08d3911095299413a42a01162b078.
+
+commit ca659813a81074cae55ffec51f923c658480b618
+Author: Julien Cristau <jcristau@debian.org>
+Date: Wed Oct 8 19:46:50 2008 +0200
+
+ Fix GKVE with key_code > 255
+
+ Move the keycode validation checks before use.
+
+commit 8337c9aa3d2009eea801a84b3a65272e03e65e1a
+Author: Luc Verhaegen <libv@skynet.be>
+Date: Wed Oct 8 14:55:29 2008 +0200
+
+ DGA: Fix ProcXF86DGASetViewPort for missing support in driver.
+
+ Fixes a segfault when trying to activate a DGA mode without checking
+ whether DGA modesetting is at all possible.
+ (cherry picked from commit 1feb69eb63e6739ff5db255ad529e84adf941a10)
+
+commit 4e6cbd323854709ae00c44108c93ab6596151de2
+Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Wed Oct 8 13:33:55 2008 +0800
+
+ Check nextEnabledOutput()'s return in bestModeForAspect()
+
+ In case no enabled outputs, we will reference wrong index of
+ output array.
+ (cherry picked from commit 56c615368c5a8e7acb0398434c2c68578626aa38)
+
+commit 43e3af9cac2e9fd613a61a870bfe00f4782a368d
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Oct 7 13:41:25 2008 -0400
+
+ int10: Fix a nasty memory leak.
+ (cherry picked from commit 94919480d8bb66e1807b4fe87b8f326ef6e012c6)
+
+commit 00ac80a0c408106158bf258b6da8350611fbfe84
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Oct 7 13:39:10 2008 -0400
+
+ int10: Don't warn when scanning for devices we don't have.
+
+ Some BIOSes (hi XGI!) will attempt to enumerate the PCI bus by asking
+ for the config space of every possible device number. This despite
+ perfectly functional BIOS methods to enumerate the bus exactly.
+ (cherry picked from commit a57b2f172c1291f22f7ba2780c1b2f55e353c3e9)
+
+commit c6ce2f6b3fe12e65b0e8a75cc1bc0a21875e14e3
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Oct 7 13:38:12 2008 -0400
+
+ int10: Remove useless check.
+
+ If you have more than one PCI device with the same d/b/d/f, you're
+ already in trouble.
+ (cherry picked from commit a65e36a873cd1ba9896cd0f9a3e94dd933666005)
+
+commit 8ef37c194fa08d3911095299413a42a01162b078
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Fri Sep 12 19:11:53 2008 -0400
+
+ Array-index based devPrivates implementation.
+
+ Note: DevPrivateKey is now pointer-to-int, which means
+ each key now needs to point to some global storage of
+ size at least sizeof(int).
+
+ (cherry picked from commit b6ab114212c0e4c3346ceb5b207f14c526ab81e7)
+
+commit e88df87851232d6b6c8da5fff802b33f5275b050
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Mon Sep 22 11:10:46 2008 +0930
+
+ xkb: squash canonical types into explicit ones on core reconstruction.
+
+ If we update key types from core, and groups 2 - n have a canonical type but
+ the same symbols as the explicit type of group 1, assume that it was a core
+ sym duplication according to Section 12.4 of the XKB Protocol Spec.
+ Ignore the canonical types and pretend there's only one group for the key -
+ with the explicit key type.
+
+ The protocol spec does not cover this case, so we have to guess here.
+ (cherry picked from commit 30c3c13f1030268aaa6a3598d538fafd0592d77a)
+
+commit be3b3cb970d040f0db4bead018c338012547334f
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date: Fri Sep 19 18:27:24 2008 +0930
+
+ xkb: fix core keyboard map generation. #14373
+
+ According to Section 12.4 of the XKB Protocol Spec, if a key only has a single
+ group but the keyboard has multiple groups defined, the core description of
+ the key is a duplication of the single group across all symbols. i.e.
+ G1L1 G1L2 G1L1 G1L2 G1L3 G1L4 G1L3 G1L4
+
+ The previous code generated G1L1 G1L2 G1L3 G1L4 G1L3 G1L4, leading to
+ "invented" groups when the process is reversed.
+
+ Note that this creates wrong key types on reconstruction from core to xkb,
+ i.e. any single-group key with a key type that is not one of the canonical
+ four (Sec 12.2.3), will get the assigned type on group 1, and a canonical type
+ for the other gruops.
+
+ X.Org Bug 14373 <http://bugs.freedesktop.org/show_bug.cgi?id=14373>
+ (cherry picked from commit ae986d1c73d2f720bd0309d8c33328d14e8eed25)
+
+commit 3bf826f59013ec14fbcf19b85a03e2967a821661
+Author: Kim Woelders <kim@woelders.dk>
+Date: Mon Sep 22 08:37:29 2008 +0930
+
+ xkb: fix use of uninitialized variable.
+
+ And some cosmetic changes to use stuff->change consistently.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+ (cherry picked from commit 8c46505d7d91e0644b19cccc4b342fceb6f86cab)
+
+commit 88ebde608daaca4793e1b637302899ba65d165ec
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Oct 6 20:10:25 2008 -0700
+
+ Remove usage of mfbChangeWindowAttributes missed in e4d11e58c...
+
+commit af8cef461c4d107f7a03645568a635d0458da9b8
+Author: Alan Hourihane <alanh@tungstengraphics.com>
+Date: Wed Sep 24 14:24:36 2008 +0100
+
+ only build dri2 when DRI2 is enabled
+
commit 97f688f2b4b8ebfba77be00db68c4e6a555a5d62
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 23 14:51:33 2008 -0400
diff --git a/debian/changelog b/debian/changelog
index 7f27aa0..be877d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg-server (2:1.5.1-2) UNRELEASED; urgency=low
+xorg-server (2:1.5.2-1) UNRELEASED; urgency=low
+ * New upstream bugfix release.
* debian/rules: define PCI_TXT_IDS_DIR to unbreak the pci id matching using
plain text files provided by drivers.
* Don't pass --with-serverconfig-path to configure, we only used to override
commit 99941cae92a49b113e40309c9787aa926dccac3d
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 11 02:50:12 2008 +0200
Re-introduce the xserver-common package
It contains /usr/lib/xorg/protocol.txt and the Xserver(1) manpage for now.
diff --git a/debian/changelog b/debian/changelog
index e8a1f7e..7f27aa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xorg-server (2:1.5.1-2) UNRELEASED; urgency=low
plain text files provided by drivers.
* Don't pass --with-serverconfig-path to configure, we only used to override
it for Xprint.
+ * Re-introduce the xserver-common package, containing
+ /usr/lib/xorg/protocol.txt and the Xserver(1) manpage for now.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Sep 2008 18:50:19 +0200
diff --git a/debian/control b/debian/control
index 7320cda..533ec77 100644
--- a/debian/control
+++ b/debian/control
@@ -40,15 +40,15 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
Package: xserver-xorg-core
Architecture: any
-Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
+Depends: xserver-common (>> 7), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
Recommends: xkb-data, xfonts-base, libgl1-mesa-dri (>= 7.1~rc1)
Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
- xserver-xorg-video, xserver-common, xserver-xorg-video-1.0, xserver-xorg-input,
+ xserver-xorg-video, xserver-common (<< 7), xserver-xorg-video-1.0, xserver-xorg-input,
xserver-xorg-video-1.9, xserver-xorg-input-wacom (<< 0.7.8),
xserver-xorg-video-2, xserver-xorg-input-2
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
- xserver-common
+ xserver-common (<< 7)
Provides: xserver
Description: Xorg X server - core server
The Xorg X server is an X server for several architectures and operating
@@ -93,7 +93,7 @@ Description: Xorg X server - development files
Package: xdmx
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-common
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
@@ -128,7 +128,7 @@ Description: Distributed Multihead X tools
Package: xnest
Architecture: any
-Depends: x11-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends}
Recommends: libgl1-mesa-dri (>= 7.1~rc1)
Description: Nested X server
Xnest is a nested X server that simply relays all its requests to another
@@ -147,7 +147,7 @@ Description: Nested X server
Package: xvfb
Architecture: any
-Depends: x11-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends}
Recommends: xauth, xfonts-base
Description: Virtual Framebuffer 'fake' X server
Xvfb provides an X server that can run on machines with no display hardware
@@ -174,7 +174,7 @@ Description: Virtual Framebuffer 'fake' X server
Package: xserver-xephyr
Architecture: any
-Depends: x11-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends}
Recommends: xbase-clients, xfonts-base, libgl1-mesa-dri (>= 7.1~rc1)
Description: nested X server
Xephyr is an X server that can be run inside another X server,
@@ -191,7 +191,7 @@ Description: nested X server
Package: xserver-xfbdev
Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh3 sh3eb sh4 sh4eb sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common, ${shlibs:Depends}, ${misc:Depends}
Recommends: xbase-clients, xfonts-base
Description: Linux framebuffer device tiny X server
xserver-xfbdev is a Linux framebuffer device tiny X server based on the
@@ -217,3 +217,10 @@ Description: Xorg - the X.Org X server (debugging symbols)
.
This package provides debugging symbols for the Xorg X server and associated
modules.
+
+Package: xserver-common
+Architecture: all
+Depends: x11-common
+Replaces: xserver-xorg-core (<< 2:1.5.2)
+Description: common files used by various X servers
+ This package provides files necessary for all X.Org based X servers.
diff --git a/debian/rules b/debian/rules
index 69da3cd..ee13076 100755
--- a/debian/rules
+++ b/debian/rules
@@ -174,7 +174,13 @@ binary-arch: build install
# Build architecture-independent files here
-binary-indep:
+binary-indep: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
+ dh_install -i --sourcedir=debian/tmp
+ dh_installdocs -i
+ dh_installchangelogs -i
+
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-deb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/xserver-common.install b/debian/xserver-common.install
new file mode 100644
index 0000000..46a7630
--- /dev/null
+++ b/debian/xserver-common.install
@@ -0,0 +1,2 @@
+usr/lib/xorg/protocol.txt
+usr/share/man/man1/Xserver.1
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index 2fe61f9..c88d80f 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -5,7 +5,6 @@ usr/lib/xorg/modules/linux/*.so
usr/lib/xorg/modules/freebsd/*.so
usr/lib/xorg/modules/multimedia/*.so
usr/bin/Xorg
-usr/share/man/man1/Xserver.1
usr/share/man/man1/Xorg.1
usr/share/man/man4/exa.4
usr/share/man/man4/fbdevhw.4
commit c422dc76386eee5743f74c34978f9e9d7466925b
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 11 02:49:35 2008 +0200
Don't pass --with-serverconfig-path to configure
We only used to override it for Xprint.
diff --git a/debian/changelog b/debian/changelog
index 72a4dc2..e8a1f7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg-server (2:1.5.1-2) UNRELEASED; urgency=low
* debian/rules: define PCI_TXT_IDS_DIR to unbreak the pci id matching using
plain text files provided by drivers.
+ * Don't pass --with-serverconfig-path to configure, we only used to override
+ it for Xprint.
-- Julien Cristau <jcristau@debian.org> Thu, 25 Sep 2008 18:50:19 +0200
diff --git a/debian/rules b/debian/rules
index c04a817..69da3cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,6 @@ VENDOR = $(shell lsb_release -i -s)
confflags += --disable-static \
--enable-xorg \
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" \
- --with-serverconfig-path=/etc/X11/xserver \
--enable-xtrap \
--enable-glx-tls \
--enable-dmx \
commit 6dcfa994b0777bf0cabeb71672f13e650b340817
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 10 15:26:32 2008 -0400
xserver 1.5.2
diff --git a/configure.ac b/configure.ac
index ef276cc..88749a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.5.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="23 September 2008"
+AC_INIT([xorg-server], 1.5.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="10 October 2008"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit 75504517a30f1bdd593c2a32af81084b59b398a5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 10 13:41:50 2008 -0400
EDID: Catch monitors that encode aspect ratio for physical size.
This is not legal in either EDID 1.3 or 1.4, but hey, when did a little
thing like legality stop anyone.
(cherry picked from commit 0660dd9d7009147c395b9ea904539f76f55b9a7f)
diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index 21391dd..958247c 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -85,6 +85,47 @@ handle_edid_quirks(xf86MonPtr m)
}
}
}
+
+ /*
+ * some monitors encode the aspect ratio instead of the physical size.
+ * try to find the largest detailed timing that matches that aspect
+ * ratio and use that to fill in the feature section.
+ */
+ if ((m->features.hsize == 16 && m->features.vsize == 9) ||
+ (m->features.hsize == 16 && m->features.vsize == 10) ||
+ (m->features.hsize == 4 && m->features.vsize == 3) ||
+ (m->features.hsize == 5 && m->features.vsize == 4)) {
+ int real_hsize = 0, real_vsize = 0;
+ float target_aspect, timing_aspect;
+
+ target_aspect = (float)m->features.hsize / (float)m->features.vsize;
+ for (i = 0; i < 4; i++) {
+ if (m->det_mon[i].type == DT) {
+ struct detailed_timings *timing;
+ timing = &m->det_mon[i].section.d_timings;
+
+ if (!timing->v_size)
+ continue;
+
+ timing_aspect = (float)timing->h_size / (float)timing->v_size;
+ if (fabs(1 - (timing_aspect / target_aspect)) < 0.05) {
+ real_hsize = max(real_hsize, timing->h_size);
+ real_vsize = max(real_vsize, timing->v_size);
+ }
+ }
+ }
+
+ if (real_hsize && real_vsize) {
+ /* convert mm to cm */
+ m->features.hsize = (real_hsize + 5) / 10;
+ m->features.vsize = (real_vsize + 5) / 10;
+ } else {
+ m->features.hsize = m->features.vsize = 0;
+ }
+
+ xf86Msg(X_INFO, "Quirked EDID physical size to %dx%d cm\n",
+ m->features.hsize, m->features.vsize);
+ }
}
xf86MonPtr
commit 2844713eabdceb6d726a07fa06754ee1ac66fd38
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 30 00:49:32 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 0e39d85..cc60ed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.4.2-7) UNRELEASED; urgency=low
+xorg-server (2:1.4.2-7) unstable; urgency=low
* Update debian/copyright to the SGI Free Software License B, version 2.0.
It now mirrors the free X11 license used by X.Org.
@@ -11,7 +11,7 @@ xorg-server (2:1.4.2-7) UNRELEASED; urgency=low
* xvfb-run: append to $ERRORFILE instead of truncating it, so the error
output from Xvfb is not deleted when we run 'xauth remove'.
- -- Julien Cristau <jcristau@debian.org> Fri, 19 Sep 2008 17:38:00 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 30 Sep 2008 00:39:58 +0200
xorg-server (2:1.4.2-6) unstable; urgency=low
commit 554fbb20e7792d0207f485af9842f8714abc941c
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 29 16:11:13 2008 +0200
xvfb-run: append to $ERRORFILE instead of truncating it
Otherwise the error output from Xvfb is deleted when we run 'xauth remove'.
diff --git a/debian/changelog b/debian/changelog
index ce84323..0e39d85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ xorg-server (2:1.4.2-7) UNRELEASED; urgency=low
still not free. SGI has since released their code under FreeB, but that
doesn't necessarily apply to contributions from other people. Hopefully
this can be cleared up soon, though.
+ * xvfb-run: append to $ERRORFILE instead of truncating it, so the error
+ output from Xvfb is not deleted when we run 'xauth remove'.
-- Julien Cristau <jcristau@debian.org> Fri, 19 Sep 2008 17:38:00 +0200
diff --git a/debian/local/xvfb-run b/debian/local/xvfb-run
index 5bbd886..c85f86a 100644
--- a/debian/local/xvfb-run
+++ b/debian/local/xvfb-run
@@ -84,7 +84,7 @@ find_free_servernum() {
# Clean up files
clean_up() {
if [ -e "$AUTHFILE" ]; then
- XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
+ XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1
fi
if [ -n "$XVFB_RUN_TMPDIR" ]; then
if ! rm -r "$XVFB_RUN_TMPDIR"; then
@@ -158,8 +158,8 @@ fi
# Start Xvfb.
MCOOKIE=$(mcookie)
XAUTHORITY=$AUTHFILE xauth add ":$SERVERNUM" "$XAUTHPROTO" "$MCOOKIE" \
- >"$ERRORFILE" 2>&1
-XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >"$ERRORFILE" \
+ >>"$ERRORFILE" 2>&1
+XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
2>&1 &
XVFBPID=$!
sleep "$STARTWAIT"
commit fc895bca5eb03bd1269b01509af396c6edb74266
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 29 15:48:27 2008 +0200
Slightly reword the changelog entry
diff --git a/debian/changelog b/debian/changelog
index f54acd7..ce84323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,11 @@ xorg-server (2:1.4.2-7) UNRELEASED; urgency=low
* Update debian/copyright to the SGI Free Software License B, version 2.0.
It now mirrors the free X11 license used by X.Org.
http://www.sgi.com/company_info/newsroom/press_releases/2008/september/opengl.html
- Not closing bug#211765 for now, because GL/glx/glxext.c and
+ * Not closing bug#211765 for now, because GL/glx/glxext.c and
hw/dmx/glxProxy/glxext.c are covered by the GLX Public License, which is
- still not free.
+ still not free. SGI has since released their code under FreeB, but that
+ doesn't necessarily apply to contributions from other people. Hopefully
+ this can be cleared up soon, though.
-- Julien Cristau <jcristau@debian.org> Fri, 19 Sep 2008 17:38:00 +0200
commit 587518926d8ecead1617461b8cc9062917c71a52
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 19 18:13:08 2008 +0200
Update debian/copyright to the SGI Free Software License B, version 2.0.
It now mirrors the free X11 license used by X.Org.
http://www.sgi.com/company_info/newsroom/press_releases/2008/september/opengl.html
Not closing bug#211765 for now, because GL/glx/glxext.c and
hw/dmx/glxProxy/glxext.c are covered by the GLX Public License, which is still
not free.
diff --git a/debian/changelog b/debian/changelog
index 2baa16c..f54acd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.4.2-7) UNRELEASED; urgency=low
+
+ * Update debian/copyright to the SGI Free Software License B, version 2.0.
+ It now mirrors the free X11 license used by X.Org.
+ http://www.sgi.com/company_info/newsroom/press_releases/2008/september/opengl.html
+ Not closing bug#211765 for now, because GL/glx/glxext.c and
+ hw/dmx/glxProxy/glxext.c are covered by the GLX Public License, which is
+ still not free.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 19 Sep 2008 17:38:00 +0200
+
xorg-server (2:1.4.2-6) unstable; urgency=low
* Xevie: always set rep.length to 0 (closes: #497337). Thanks, Thorvald
diff --git a/debian/copyright b/debian/copyright
index 313c852..877985f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -832,188 +832,32 @@ info@urwpp.de or design@bigelowandholmes.com
Certain files in this package (e.g. GL/glx/g_*) are covered by the SGI
Free Software License B, Version 1.1, http://oss.sgi.com/projects/FreeB
-SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000])
-1. Definitions.
-1.1. "Additional Notice Provisions" means such additional provisions as appear in the
-Notice in Original Code under the heading "Additional Notice Provisions."
-1.2. "Covered Code" means the Original Code or Modifications, or any combination thereof.
-1.3. "Hardware" means any physical device that accepts input, processes input, stores the
-results of processing, and/or provides output.
-1.4. "Larger Work" means a work that combines Covered Code or portions thereof with
-code not governed by the terms of this License.
-1.5. "Licensable" means having the right to grant, to the maximum extent possible, whether
-at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-1.6. "License" means this document.
-1.7. "Licensed Patents" means patent claims Licensable by SGI that are infringed by the use
-or sale of Original Code or any Modifications provided by SGI, or any combination thereof.
-1.8. "Modifications" means any addition to or deletion from the substance or structure of the
-Original Code or any previous Modifications. When Covered Code is released as a series of files,
-a Modification is:
-A. Any addition to the contents of a file containing Original Code and/or addition to or
-deletion from the contents of a file containing previous Modifications.
-B. Any new file that contains any part of the Original Code or previous Modifications.
-1.9. "Notice" means any notice in Original Code or Covered Code, as required by and in
-compliance with this License.
-1.10. "Original Code" means source code of computer software code that is described in the
-source code Notice required by Exhibit A as Original Code, and updates and error corrections
-specifically thereto.
-1.11. "Recipient" means an individual or a legal entity exercising rights under, and complying
-with all of the terms of, this License or a future version of this License issued under Section 8.
-For legal entities, "Recipient" includes any entity that controls, is controlled by, or is under
-common control with Recipient. For purposes of this definition, "control" of an entity means (a)
-the power, direct or indirect, to direct or manage such entity, or (b) ownership of fifty percent
-(50%) or more of the outstanding shares or beneficial ownership of such entity.
-1.12. "Recipient Patents" means patent claims Licensable by a Recipient that are infringed by
-the use or sale of Original Code or any Modifications provided by SGI, or any combination
-thereof.
-1.13. "SGI" means Silicon Graphics, Inc.
-1.14. "SGI Patents" means patent claims Licensable by SGI other than the Licensed Patents.
-2. License Grant and Restrictions.
-2.1. SGI License Grant. Subject to the terms of this License and any third party intellectual
-property claims, for the duration of intellectual property protections inherent in the Original
-Code, SGI hereby grants Recipient a worldwide, royalty-free, non-exclusive license, to do the
-following: (i) under copyrights Licensable by SGI, to reproduce, distribute, create derivative
-works from, and, to the extent applicable, display and perform the Original Code and/or any
-Modifications provided by SGI alone and/or as part of a Larger Work; and (ii) under any
-Licensable Patents, to make, have made, use, sell, offer for sale, import and/or otherwise transfer
-the Original Code and/or any Modifications provided by SGI. Recipient accepts the terms and
-conditions of this License by undertaking any of the aforementioned actions. The patent license
-shall apply to the Covered Code if, at the time any related Modification is added, such addition
-of the Modification causes such combination to be covered by the Licensed Patents. The patent
-license in Section 2.1(ii) shall not apply to any other combinations that include the Modification.
-No patent license is provided under SGI Patents for infringements of SGI Patents by
-Modifications not provided by SGI or combinations of Original Code and Modifications not
-provided by SGI.
-2.2. Recipient License Grant. Subject to the terms of this License and any third party
-intellectual property claims, Recipient hereby grants SGI and any other Recipients a worldwide,
-royalty-free, non-exclusive license, under any Recipient Patents, to make, have made, use, sell,
-offer for sale, import and/or otherwise transfer the Original Code and/or any Modifications
-provided by SGI.
-2.3. No License For Hardware Implementations. The licenses granted in Section 2.1 and
-2.2 are not applicable to implementation in Hardware of the algorithms embodied in the Original
-Code or any Modifications provided by SGI .
-3. Redistributions.
-3.1. Retention of Notice/Copy of License. The Notice set forth in Exhibit A, below, must be
-conspicuously retained or included in any and all redistributions of Covered Code. For
-distributions of the Covered Code in source code form, the Notice must appear in every file that
-can include a text comments field; in executable form, the Notice and a copy of this License
-must appear in related documentation or collateral where the Recipient's rights relating to
-Covered Code are described. Any Additional Notice Provisions which actually appears in the
-Original Code must also be retained or included in any and all redistributions of Covered Code.
-3.2. Alternative License. Provided that Recipient is in compliance with the terms of this
-License, Recipient may, so long as without derogation of any of SGI's rights in and to the
-Original Code, distribute the source code and/or executable version(s) of Covered Code under
-(1) this License; (2) a license identical to this License but for only such changes as are necessary
-in order to clarify Recipient's role as licensor of Modifications; and/or (3) a license of
-Recipient's choosing, containing terms different from this License, provided that the license
-terms include this Section 3 and Sections 4, 6, 7, 10, 12, and 13, which terms may not be
-modified or superseded by any other terms of such license. If Recipient elects to use any license
-other than this License, Recipient must make it absolutely clear that any of its terms which differ
-from this License are offered by Recipient alone, and not by SGI. It is emphasized that this
-License is a limited license, and, regardless of the license form employed by Recipient in
-accordance with this Section 3.2, Recipient may relicense only such rights, in Original Code and
-Modifications by SGI, as it has actually been granted by SGI in this License.
-3.3. Indemnity. Recipient hereby agrees to indemnify SGI for any liability incurred by SGI
-as a result of any such alternative license terms Recipient offers.
-4. Termination. This License and the rights granted hereunder will terminate automatically
-if Recipient breaches any term herein and fails to cure such breach within 30 days thereof. Any
-sublicense to the Covered Code that is properly granted shall survive any termination of this
-License, absent termination by the terms of such sublicense. Provisions that, by their nature,
-must remain in effect beyond the termination of this License, shall survive.
-5. No Trademark Or Other Rights. This License does not grant any rights to: (i) any
-software apart from the Covered Code, nor shall any other rights or licenses not expressly
-granted hereunder arise by implication, estoppel or otherwise with respect to the Covered Code;
-(ii) any trade name, trademark or service mark whatsoever, including without limitation any
-related right for purposes of endorsement or promotion of products derived from the Covered
-Code, without prior written permission of SGI; or (iii) any title to or ownership of the Original
-Code, which shall at all times remains with SGI. All rights in the Original Code not expressly
-granted under this License are reserved.
-6. Compliance with Laws; Non-Infringement. There are various worldwide laws,
-regulations, and executive orders applicable to dispositions of Covered Code, including without
-limitation export, re-export, and import control laws, regulations, and executive orders, of the
-U.S. government and other countries, and Recipient is reminded it is obliged to obey such laws,
-regulations, and executive orders. Recipient may not distribute Covered Code that (i) in any way
-infringes (directly or contributorily) any intellectual property rights of any kind of any other
-person or entity or (ii) breaches any representation or warranty, express, implied or statutory, to
-which, under any applicable law, it might be deemed to have been subject.
-7. Claims of Infringement. If Recipient learns of any third party claim that any disposition
-of Covered Code and/or functionality wholly or partially infringes the third party's intellectual
-property rights, Recipient will promptly notify SGI of such claim.
-8. Versions of the License. SGI may publish revised and/or new versions of the License
-from time to time, each with a distinguishing version number. Once Covered Code has been
-published under a particular version of the License, Recipient may, for the duration of the
-license, continue to use it under the terms of that version, or choose to use such Covered Code
-under the terms of any subsequent version published by SGI. Subject to the provisions of
-Sections 3 and 4 of this License, only SGI may modify the terms applicable to Covered Code
-created under this License.
-9. DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED "AS IS." ALL
-EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED,
-INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-PARTICULAR PURPOSE, AND NON-INFRINGEMENT. SGI ASSUMES NO RISK AS TO
-THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD THE SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR
-SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY IS AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS
-AUTHORIZED HEREUNDER EXCEPT SUBJECT TO THIS DISCLAIMER.
-10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES NOR LEGAL
-THEORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR
-STRICT LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI
-LICENSOR BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
-CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF
-DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
Reply to: