Author: branden Date: 2003-07-30 11:44:25 -0500 (Wed, 30 Jul 2003) New Revision: 332
Modified: branches/4.3.0/sid/debian/control Log: debian/control: merge revision 318 from trunk Modified: branches/4.3.0/sid/debian/control ============================================================================== --- branches/4.3.0/sid/debian/control 2003-07-30 16:36:17 UTC (rev 331) +++ branches/4.3.0/sid/debian/control 2003-07-30 16:44:25 UTC (rev 332) @@ -921,7 +921,7 @@ Package: xserver-xfree86 Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc -Depends: debconf (>> 0.5), xserver-common (>= 4.1.0-10), ${shlibs:Depends}, ${misc:Depends} +Depends: xserver-common (>= 4.1.0-10), ${shlibs:Depends}, ${misc:Depends} Suggests: discover, mdetect, read-edid Conflicts: libxfont-xtt Replaces: xserver-common (<< 4.0), libxfont-xtt @@ -950,7 +950,7 @@ Package: xserver-xfree86-dbg Priority: extra Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc -Depends: debconf (>> 0.5), xserver-common (>= 4.1.0-10), ${shlibs:Depends}, ${misc:Depends} +Depends: xserver-common (>= 4.1.0-10), ${shlibs:Depends}, ${misc:Depends} Recommends: xserver-xfree86 Suggests: discover, mdetect, read-edid Conflicts: libxfont-xtt -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]