X Strike Force XFree86 SVN commit: rev 930 - branches/4.3.0/sid/debian
Author: branden
Date: 2004-01-16 17:51:54 -0500 (Fri, 16 Jan 2004)
New Revision: 930
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/control
Log:
Acknowledge the long-awaited unscrewing of GNU CPP's -traditional support.
Remove build-dependency on cpp-3.2 (cpp is build-essential); add
build-conflict on cpp-3.3 prior to 1:3.3.3ds1-0pre1; generalize
xbase-clients's, xdm's, and xutils's dependencies from cpp-3.2 to cpp; and
add conflict for each of these packages with versions of cpp-3.3 prior to
1:3.3.3ds1-0pre1.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-16 22:28:58 UTC (rev 929)
+++ branches/4.3.0/sid/debian/changelog 2004-01-16 22:51:54 UTC (rev 930)
@@ -101,8 +101,16 @@
XFree86 gets a fixed XPRINT server. (Closes: #209352)
- debian/control
- -- Branden Robinson <branden@debian.org> Fri, 16 Jan 2004 17:27:44 -0500
+ * Acknowledge the long-awaited unscrewing of GNU CPP's -traditional support.
+ Remove build-dependency on cpp-3.2 (cpp is build-essential); add
+ build-conflict on cpp-3.3 prior to 1:3.3.3ds1-0pre1; generalize
+ xbase-clients's, xdm's, and xutils's dependencies from cpp-3.2 to cpp; and
+ add conflict for each of these packages with versions of cpp-3.3 prior to
+ 1:3.3.3ds1-0pre1.
+ - debian/control
+ -- Branden Robinson <branden@debian.org> Fri, 16 Jan 2004 17:46:47 -0500
+
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
Modified: branches/4.3.0/sid/debian/control
===================================================================
--- branches/4.3.0/sid/debian/control 2004-01-16 22:28:58 UTC (rev 929)
+++ branches/4.3.0/sid/debian/control 2004-01-16 22:51:54 UTC (rev 930)
@@ -4,8 +4,8 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <branden@debian.org>
Standards-Version: 3.6.1
-Build-Depends: dpkg (>= 1.7.0), cpp-3.2, 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: gcc-3.3 (<< 1:3.3.2-0pre1)
+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)
Package: lbxproxy
Architecture: any
@@ -877,8 +877,8 @@
Package: xbase-clients
Architecture: any
-Depends: cpp-3.2, 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)
+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)
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
@@ -968,13 +968,14 @@
xf86cfg, xman, xsetroot, and xsm programs use bitmap images provided by the
xlibs-data package.
.
- xrdb requires the C preprocessor (cpp) to process X resource files. GNU CPP
- version 3.2 is required, as the command's "-traditional" support misbehaves
- in version 3.3.
+ xrdb requires the C preprocessor (cpp) to process X resource files. The GNU
+ C preprocessor's "-traditional" support misbehaves in early releases of the
+ GCC 3.3 series; therefore, this package conflicts with those versions.
Package: xdm
Architecture: any
-Depends: debconf (>= 1.2.9), xbase-clients, cpp-3.2, ${shlibs:Depends}, ${misc:Depends}
+Depends: debconf (>= 1.2.9), xbase-clients, cpp, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: cpp-3.3 (<< 1:3.3.3ds1-0pre1)
Suggests: xutils
Replaces: xbase (<< 3.3.2.3a-2), xbase-clients (<< 4.0)
Provides: x-display-manager
@@ -992,8 +993,8 @@
necessary for xdm to function.
.
xdm requires the C preprocessor (cpp) to process its configuration files.
- GNU CPP version 3.2 is required, as the command's "-traditional" support
- misbehaves in version 3.3.
+ The GNU C preprocessor's "-traditional" support misbehaves in early releases
+ of the GCC 3.3 series; therefore, this package conflicts with those versions.
Package: xfonts-100dpi
Architecture: all
@@ -1717,9 +1718,9 @@
Package: xutils
Architecture: any
-Depends: xfree86-common (>> 4.3), cpp-3.2, ${shlibs:Depends}, ${misc:Depends}
+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)
+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)
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
@@ -1774,9 +1775,9 @@
rstart is to be used. The luit program requires locale information from
the xlibs-data package.
.
- imake uses the C preprocessor (cpp) as a macro processor. GNU CPP version
- 3.2 is required, as the command's "-traditional" support misbehaves in
- version 3.3.
+ imake uses the C preprocessor (cpp) as a macro processor. The GNU C
+ preprocessor's "-traditional" support misbehaves in early releases of the GCC
+ 3.3 series; therefore, this package conflicts with those versions.
Package: xvfb
Architecture: any
Reply to: