debian/changelog | 3 ++-
debian/control | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 7a5c8ba22cc410c0c21920505e141cd8d7fd41f8
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Tue Feb 5 20:49:48 2008 -0500
+ Move ${shlib:Depends} from x11-common to xserver-xorg
diff --git a/debian/changelog b/debian/changelog
index 0cc394a..a9e8c19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ xorg (1:7.3+11) UNRELEASED; urgency=low
+ 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
+ + Move ${shlib:Depends} from x11-common to xserver-xorg
- -- David Nusinow <[EMAIL PROTECTED]> Mon, 04 Feb 2008 19:05:50 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Tue, 05 Feb 2008 20:46:12 -0500
xorg (1:7.3+10) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2a8662a..c606f46 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>=
4.1.16)
Package: x11-common
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, debianutils (>= 1.13), lsb-base
(>= 1.3-9ubuntu2)
+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.3+11), xserver-xfree86 (<< 1:7.0),
@@ -82,7 +82,7 @@ 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
+Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all |
xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2,
${shlibs:Depends}, ${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
