Author: branden Date: 2004-06-09 17:47:49 -0500 (Wed, 09 Jun 2004) New Revision: 1530
Modified: trunk/debian/CHANGESETS trunk/debian/control Log: Reverting revision 1528 per IRC discussion with Fabio. Modified: trunk/debian/CHANGESETS =================================================================== --- trunk/debian/CHANGESETS 2004-06-09 20:21:27 UTC (rev 1529) +++ trunk/debian/CHANGESETS 2004-06-09 22:47:49 UTC (rev 1530) @@ -8,9 +8,6 @@ (It should always be safe to merge the latest version of TODO or CHANGESETS files anywhere.) -Dynamic version Depends: - 1528 (Override 1518) - DO NOT MERGE THE FOLLOWING REVISIONS ONTO branches/4.3.0/sid: 1518 Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2004-06-09 20:21:27 UTC (rev 1529) +++ trunk/debian/control 2004-06-09 22:47:49 UTC (rev 1530) @@ -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 (>= ${Source-Version}), ${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 (>= ${Source-Version}), ${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