Author: branden
Date: 2004-01-18 11:29:03 -0500 (Sun, 18 Jan 2004)
New Revision: 933
Modified:
branches/4.3.0/sid/debian/control
Log:
Fix conflicts and build-conflicts to be against the binary package
versioning of cpp-3.3, which omits the "ds1" from the upstream version
number (thanks, Dagfinn Ilmari Manns?\195?\165ker).
Modified: branches/4.3.0/sid/debian/control
===================================================================
--- branches/4.3.0/sid/debian/control 2004-01-17 16:45:29 UTC (rev 932)
+++ branches/4.3.0/sid/debian/control 2004-01-18 16:29:03 UTC (rev 933)
@@ -5,7 +5,7 @@
Uploaders: Branden Robinson <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev |
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev,
libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin,
po-debconf, debhelper (>= 4.1.16), html2text, libglide2-dev (>> 2001.01.26)
[i386], libglide3-dev (>= 2002.04.10-3) [i386 alpha], linux-kernel-headers
[alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh sparc], libpng12-dev
| libpng-dev, libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev
(>= 2.1.2), libxrender-dev (>= 0.8.3), libxcursor-dev, dbs, m4
-Build-Conflicts: cpp-3.3 (<< 1:3.3.3ds1-0pre1)
+Build-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1)
Package: lbxproxy
Architecture: any
@@ -878,7 +878,7 @@
Package: xbase-clients
Architecture: any
Depends: cpp, xlibs-data, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: xbase (<< 3.3.2.3a-2), xserver-common (<< 3.3.2.3a-9), xmodmap,
xaw-wrappers (<< 0.90), xfonts-100dpi (<< 3.3.3.1-3), xfonts-75dpi (<<
3.3.3.1-3), xfonts-base (<< 3.3.3.1-3), xfonts-cyrillic (<< 3.3.3.1-3),
xfonts-scalable (<< 3.3.3.1-3), xfnt100 (<= 3.3.2.3a-1), xfnt75 (<=
3.3.2.3a-1), xfntbase (<= 3.3.2.3a-1), xfntcyr (<= 3.3.2.3a-1), xfntscl (<=
3.3.2.3a-1), xdm (<< 4.0), xsm, xcontrib, xpm4g-dev, xpm-bin, xlibs (<< 4.3.0),
cpp-3.3 (<< 1:3.3.3ds1-0pre1)
+Conflicts: xbase (<< 3.3.2.3a-2), xserver-common (<< 3.3.2.3a-9), xmodmap,
xaw-wrappers (<< 0.90), xfonts-100dpi (<< 3.3.3.1-3), xfonts-75dpi (<<
3.3.3.1-3), xfonts-base (<< 3.3.3.1-3), xfonts-cyrillic (<< 3.3.3.1-3),
xfonts-scalable (<< 3.3.3.1-3), xfnt100 (<= 3.3.2.3a-1), xfnt75 (<=
3.3.2.3a-1), xfntbase (<= 3.3.2.3a-1), xfntcyr (<= 3.3.2.3a-1), xfntscl (<=
3.3.2.3a-1), xdm (<< 4.0), xsm, xcontrib, xpm4g-dev, xpm-bin, xlibs (<< 4.3.0),
cpp-3.3 (<< 1:3.3.3-0pre1)
Replaces: xbase (<< 3.3.2.3a-2), xf86setup (<< 3.3.2.3a-9), xserver-common (<<
4.0), xmodmap, xcontrib, xpm4g-dev, xpm-bin, xsm
Provides: xmodmap, xcontrib, xpm-bin, xsm
Description: miscellaneous X clients
@@ -975,7 +975,7 @@
Package: xdm
Architecture: any
Depends: debconf (>= 1.2.9), xbase-clients, cpp, ${shlibs:Depends},
${misc:Depends}
-Conflicts: cpp-3.3 (<< 1:3.3.3ds1-0pre1)
+Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1)
Suggests: xutils
Replaces: xbase (<< 3.3.2.3a-2), xbase-clients (<< 4.0)
Provides: x-display-manager
@@ -1720,7 +1720,7 @@
Architecture: any
Depends: xfree86-common (>> 4.3), cpp, ${shlibs:Depends}, ${misc:Depends}
Suggests: ssh | rsh-server, ssh | rsh-client, xlibs-data
-Conflicts: rstart, rstartd, xbase-clients (<< 4.0), xserver-common (<< 4.0),
xbase (<< 3.3.2.3a-2), cpp-3.3 (<< 1:3.3.3ds1-0pre1)
+Conflicts: rstart, rstartd, xbase-clients (<< 4.0), xserver-common (<< 4.0),
xbase (<< 3.3.2.3a-2), cpp-3.3 (<< 1:3.3.3-0pre1)
Replaces: rstart, rstartd, xbase-clients (<= 4.0.1-8), xserver-common (<<
4.0), xbase (<< 3.3.2.3a-2), xlibs-dev (<< 4.1.0-12), xlib6g-dev, dpsclient,
xcontrib
Description: X Window System utility programs
xutils provides a set of utility programs shipped with the X Window System
