Author: branden
Date: 2005-09-27 08:55:51 -0500 (Tue, 27 Sep 2005)
New Revision: 626
Modified:
trunk/debian/changelog
trunk/debian/control
Log:
Change xserver-xorg and xserver-xorg-dbg's recommendation of "discover1"
to "discover | discover1". These packages' configure scripts detect both
utilities, and use whichever one is found, so there's no reason to compel
users to have discover1 in particular installed (as aptitude does, since
it treats recommends like depends by default).
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-27 02:19:42 UTC (rev 625)
+++ trunk/debian/changelog 2005-09-27 13:55:51 UTC (rev 626)
@@ -39,8 +39,15 @@
greater bar"-key (EV_KEY_102ND) on a pc102 keyboards. Thanks Pär
Andersson. (closes: #322253)
- -- David Nusinow <[EMAIL PROTECTED]> Mon, 26 Sep 2005 22:09:33 -0400
+ [ Branden Robinson ]
+ * Change xserver-xorg and xserver-xorg-dbg's recommendation of "discover1"
+ to "discover | discover1". These packages' configure scripts detect both
+ utilities, and use whichever one is found, so there's no reason to compel
+ users to have discover1 in particular installed (as aptitude does, since
+ it treats recommends like depends by default).
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 27 Sep 2005 08:50:23 -0500
+
xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
[ Branden Robinson ]
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-09-27 02:19:42 UTC (rev 625)
+++ trunk/debian/control 2005-09-27 13:55:51 UTC (rev 626)
@@ -2525,7 +2525,7 @@
Package: xserver-xorg
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips
mipsel netbsd-i386 powerpc sparc
Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends},
${misc:Depends}
-Recommends: xlibs, discover1, mdetect, xresprobe (>= 0.4.13), laptop-detect
+Recommends: xlibs, discover | discover1, mdetect, xresprobe (>= 0.4.13),
laptop-detect
Suggests: libglide2 (>> 2001.01.26)
Conflicts: xlibs (<< 6.8.2.dfsg.1-5), libxfont-xtt, xserver-xfree86
Replaces: xserver-common (<< 4.0), libxfont-xtt, xserver-xfree86
@@ -2551,7 +2551,7 @@
Priority: extra
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips
mipsel netbsd-i386 powerpc sparc
Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends},
${misc:Depends}
-Recommends: xlibs, xserver-xorg, discover1, mdetect, xresprobe, laptop-detect
+Recommends: xlibs, xserver-xorg, discover | discover1, mdetect, xresprobe,
laptop-detect
Conflicts: xlibs (<< 6.8.2.dfsg.1-5), libxfont-xtt
Replaces: xserver-common (<< 4.0), libxfont-xtt
Provides: xserver, xserver-xorg
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
