X Strike Force X.Org X11 SVN commit: r576 - trunk/debian
Author: dnusinow
Date: 2005-09-01 18:21:59 -0500 (Thu, 01 Sep 2005)
New Revision: 576
Modified:
trunk/debian/changelog
trunk/debian/control
Log:
* Add Build-Depends on linux-kernel-headers to (<< 2.6.13+0rc3-1.1) so that
people do not get FTBFSes due to Bug#320515. The previous build-conflict
was not enough to ensure that the necessary version of l-k-h was
installed, causing an FTBFS.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-01 20:00:59 UTC (rev 575)
+++ trunk/debian/changelog 2005-09-01 23:21:59 UTC (rev 576)
@@ -6,8 +6,14 @@
on the existence of backing store in the virtual X server it uses to run
tests in.
- -- Branden Robinson <branden@debian.org> Thu, 1 Sep 2005 14:54:35 -0500
+ [ David Nusinow ]
+ * Add Build-Depends on linux-kernel-headers to (<< 2.6.13+0rc3-1.1) so that
+ people do not get FTBFSes due to Bug#320515. The previous build-conflict
+ was not enough to ensure that the necessary version of l-k-h was
+ installed, causing an FTBFS.
+ -- David Nusinow <dnusinow@debian.org> Thu, 1 Sep 2005 19:14:56 -0400
+
xorg-x11 (6.8.2.dfsg.1-6) unstable; urgency=low
[ Branden Robinson ]
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-09-01 20:00:59 UTC (rev 575)
+++ trunk/debian/control 2005-09-01 23:21:59 UTC (rev 576)
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
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-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), linux-kernel-headers (>= 2.6.13+0rc3-1.1), 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.6.13+0rc3-1.1)
# Reasons for Build-Depends:
@@ -282,6 +282,10 @@
# gcc-4.0 (>= 4.0.1-3) GCC 4.0 versions in Debian prior to
# 4.0.1-3 did not have a patch to correctly
# compile volatile types (see Debian #318218).
+# linux-kernel-headers (>= 2.6.13+0rc3-1.1)
+# Previous versions had a busted joystick.h file (see Debian #320515).
+# Build-Conflicts alone will cause sbuild to fail if too low a version
+# is installed. This will ensure that a new version is pulled in.
# Reasons for Build-Conflicts:
# cpp-3.3 (<< 1:3.3.3-0pre1)
# Previous versions of cpp 3.3 had broken support for the -traditional
Reply to: