X Strike Force XFree86 SVN commit: r1518 - trunk/debian
Author: branden
Date: 2004-06-06 13:40:49 -0500 (Sun, 06 Jun 2004)
New Revision: 1518
Modified:
trunk/debian/CHANGESETS
trunk/debian/control
Log:
Loosen the versioned dependency of xserver-xfree86{,-dbg} on xserver-common
to permit easier testing of packages built from the SVN trunk.
Do not merge this revision of debian/control onto a release branch.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-06-06 17:18:03 UTC (rev 1517)
+++ trunk/debian/CHANGESETS 2004-06-06 18:40:49 UTC (rev 1518)
@@ -8,6 +8,9 @@
(It should always be safe to merge the latest version of TODO or CHANGESETS
files anywhere.)
+DO NOT MERGE THE FOLLOWING REVISIONS ONTO branches/4.3.0/sid:
+ 1518
+
Miscellaneous cosmetic fixes.
1473, 1484, 1485, 1502
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-06-06 17:18:03 UTC (rev 1517)
+++ trunk/debian/control 2004-06-06 18:40:49 UTC (rev 1518)
@@ -1590,7 +1590,7 @@
Package: xserver-xfree86
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
-Depends: xserver-common (>= 4.3.0.dfsg.1-5), ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common (>= 4.3.0.dfsg.1-4+SVN), ${shlibs:Depends}, ${misc:Depends}
Suggests: discover, mdetect, read-edid, libglide2 (>> 2001.01.26)
Conflicts: libxfont-xtt
Replaces: xserver-common (<< 4.0), libxfont-xtt
@@ -1624,7 +1624,7 @@
Package: xserver-xfree86-dbg
Priority: extra
Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
-Depends: xserver-common (>= 4.3.0.dfsg.1-5), ${shlibs:Depends}, ${misc:Depends}
+Depends: xserver-common (>= 4.3.0.dfsg.1-4+SVN), ${shlibs:Depends}, ${misc:Depends}
Recommends: xserver-xfree86
Suggests: discover, mdetect, read-edid
Conflicts: libxfont-xtt
Reply to: