debian/changelog | 10 +++++++++-
debian/control | 10 +++++-----
debian/rules | 4 ++--
debian/x11-common.install | 1 -
debian/xserver-xorg.install | 1 +
5 files changed, 17 insertions(+), 9 deletions(-)
New commits:
commit caa744f52131ec4a9858f6a843731bdca22adaf0
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Mon Feb 4 19:06:59 2008 -0500
+ Have x11-common conflict with older xserver-xorg and vice-versa. Also
have xserver-xorg replace older x11-common
+ Set x11-common to arch: all and xserver-xorg to arch: any
diff --git a/debian/changelog b/debian/changelog
index 91a4b23..0cc394a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,15 @@ xorg (1:7.3+11) UNRELEASED; urgency=low
* Remove $named from the Should-Start/Stop LSB dependency info of the
x11-common init script, closes: #463630.
- -- Brice Goglin <[EMAIL PROTECTED]> Fri, 01 Feb 2008 23:20:50 +0100
+ [ David Nusinow ]
+ * Ship the X server wrapper in xserver-xorg rather than x11-common. This
+ avoids having an unnecessary SUID binary on some systems. Thanks Stephen
+ Frost. closes: #400632
+ + Have x11-common conflict with older xserver-xorg and vice-versa. Also
+ have xserver-xorg replace older x11-common
+ + Set x11-common to arch: all and xserver-xorg to arch: any
+
+ -- David Nusinow <[EMAIL PROTECTED]> Mon, 04 Feb 2008 19:05:50 -0500
xorg (1:7.3+10) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e4a90c0..2a8662a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,11 @@ Standards-Version: 3.7.3.0
Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 4.1.16)
Package: x11-common
-Architecture: any
+Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, debianutils (>= 1.13), lsb-base
(>= 1.3-9ubuntu2)
Pre-Depends: debconf | debconf-2.0
Conflicts: xfree86-common, xorg-common, xserver-common, x-common,
- xserver-xorg (<< 1:7.0.12), xserver-xfree86 (<< 1:7.0),
+ xserver-xorg (<< 1:7.3+11), xserver-xfree86 (<< 1:7.0),
libxft-dev (<= 2.1.8.2-5), aee (<= 2.2.15b-1), ascd (<= 0.13.2-3),
bibview (<= 2.2-8), fvwm1 (<= 1.24r-46), grace (<= 1:5.1.18-1),
groff (<= 1.18.1.1-7), hfsutils-tcltk (<= 3.2.6-7), login.app (<= 1.2.1-18),
@@ -78,9 +78,9 @@ Description: X Window System (X.Org) infrastructure
terms are functionally interchangeable in an Debian system.
Package: xserver-xorg
-Architecture: all
-Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
-Replaces: xserver-common
+Architecture: any
+Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common, x11-common (<<
1:7.3+11)
+Replaces: xserver-common, x11-common (<< 1:7.3+11)
Pre-Depends: x11-common (>= 1:7.3+3)
Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all |
xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2,
${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}
diff --git a/debian/rules b/debian/rules
index 0ecc843..28c4755 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,8 +119,8 @@ binary-arch: build install
dh_fixperms
chown root:root debian/x11-common/etc/X11/Xsession
chmod 755 debian/x11-common/etc/X11/Xsession
- chown root:root debian/x11-common/usr/bin/X
- chmod ug+s debian/x11-common/usr/bin/X
+ chown root:root debian/xserver-xorg/usr/bin/X
+ chmod ug+s debian/xserver-xorg/usr/bin/X
dh_installdeb
dh_shlibdeps
dh_gencontrol --
-VF:XServer-Xorg-Video-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) \
diff --git a/debian/x11-common.install b/debian/x11-common.install
index f1c54c4..c217fa1 100644
--- a/debian/x11-common.install
+++ b/debian/x11-common.install
@@ -1,4 +1,3 @@
-debian/local/X usr/bin
debian/local/dexconf usr/bin
debian/local/rgb.txt etc/X11
debian/local/Xsession etc/X11
diff --git a/debian/xserver-xorg.install b/debian/xserver-xorg.install
new file mode 100644
index 0000000..3e06580
--- /dev/null
+++ b/debian/xserver-xorg.install
@@ -0,0 +1 @@
+debian/local/X usr/bin
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
