X Strike Force X.Org X11 SVN commit: r521 - trunk/debian
Author: branden
Date: 2005-08-11 14:38:50 -0500 (Thu, 11 Aug 2005)
New Revision: 521
Modified:
trunk/debian/changelog
trunk/debian/control
Log:
Increment versioning of build-conflict with linux-kernel-headers to (<<
2.6.13+0rc3-1.1) so that people do not get FTBFSes due to Bug#320515.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-08-11 15:12:49 UTC (rev 520)
+++ trunk/debian/changelog 2005-08-11 19:38:50 UTC (rev 521)
@@ -1,8 +1,10 @@
xorg-x11 (6.8.2.dfsg.1-5+SVN) UNRELEASED; urgency=low
- * dummy entry; replace with real one
+ [ Branden Robinson ]
+ * Increment versioning of build-conflict with linux-kernel-headers to (<<
+ 2.6.13+0rc3-1.1) so that people do not get FTBFSes due to Bug#320515.
- -- Branden Robinson <branden@debian.org> Wed, 10 Aug 2005 10:57:24 -0500
+ -- Branden Robinson <branden@debian.org> Thu, 11 Aug 2005 14:35:46 -0500
xorg-x11 (6.8.2.dfsg.1-5) unstable; urgency=low
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-08-11 15:12:49 UTC (rev 520)
+++ trunk/debian/control 2005-08-11 19:38:50 UTC (rev 521)
@@ -5,7 +5,7 @@
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
Standards-Version: 3.6.1
Build-Depends: bison, bsdmainutils, flex, fontconfig, groff, tetex-bin, libexpat1-dev | libexpat-dev, libfreetype6-dev, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-7) [alpha amd64 i386 ia64], libncurses5-dev | libncurses-dev, libselinux1-dev [!kfreebsd-i386 !hurd-i386], libpam0g-dev | libpam-dev, libpng12-dev | libpng-dev, libxcursor-dev, libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0), render-dev (>> 1:0.9), zlib1g-dev | libz-dev, debhelper (>= 4.1.16), dpkg-dev (>= 1.10.14), lynx, po-debconf, quilt, gcc-4.0 (>= 4.0.1-3)
-Build-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1), linux-kernel-headers (<< 2.5.999-test7-bk-15) [sparc]
+Build-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1), linux-kernel-headers (<< 2.6.13+0rc3-1.1)
# Reasons for Build-Depends:
#
@@ -285,8 +285,8 @@
# cpp-3.3 (<< 1:3.3.3-0pre1)
# Previous versions of cpp 3.3 had broken support for the -traditional
# flag.
-# linux-kernel-headers (<< 2.5.999-test7-bk-15) [sparc]
-# Previous versions had a bug that caused build failures on SPARC.
+# linux-kernel-headers (<< 2.6.13+0rc3-1.1)
+# Previous versions had a busted joystick.h file (see Debian #320515).
Package: lbxproxy
Architecture: any
Reply to: