X Strike Force XFree86 SVN commit: rev 964 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2004-01-22 15:37:50 -0500 (Thu, 22 Jan 2004)
New Revision: 964
Removed:
branches/4.3.0/sid/debian/patches/104_sparc_sbus_needs_linux_fb_headers.diff
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/control
Log:
Add versioned build-dependency on linux-kernel-headers (>=
2.5.999-test7-bk-15) for SPARC only; previous versions of
linux-kernel-headers have a bug that causes XFree86 builds to fail on that
architecture.
Drop now-uneeded (and incorrect) patch that worked around the
linux-kernel-headers bug.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-22 18:47:33 UTC (rev 963)
+++ branches/4.3.0/sid/debian/changelog 2004-01-22 20:37:50 UTC (rev 964)
@@ -87,11 +87,6 @@
(Closes: #220814)
- debian/patches/050_fix_lnx_io_kbd_rate_fix.diff
- * Fix another FTBFS on SPARC, this one hiding behind the previous one. The
- SBUS bus support code uses symbols from the Linux kernel's fb.h header
- file without #including it.
- - debian/patches/104_sparc_sbus_needs_linux_fb_headers.diff
-
* Update build-dependencies; kernel-headers-2.4 (virtual package) becomes
linux-kernel-headers (real package) and "libpng12-0-dev | libpng-dev"
becomes "libpng12-dev | libpng-dev" (libpng12-0-dev is no more).
@@ -156,8 +151,14 @@
- debian/xserver-common.{config,preinst,postinst,postrm}.in
- debian/xserver-xfree86.{config,preinst,postinst,prerm,postrm}.in
- -- Branden Robinson <branden@debian.org> Thu, 22 Jan 2004 13:22:06 -0500
+ * Add versioned build-dependency on linux-kernel-headers (>=
+ 2.5.999-test7-bk-15) for SPARC only; previous versions of
+ linux-kernel-headers have a bug that causes XFree86 builds to fail on that
+ architecture.
+ - debian/control
+ -- Branden Robinson <branden@debian.org> Thu, 22 Jan 2004 15:34:55 -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-22 18:47:33 UTC (rev 963)
+++ branches/4.3.0/sid/debian/control 2004-01-22 20:37:50 UTC (rev 964)
@@ -4,7 +4,7 @@
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), 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-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) [alpha i386], linux-kernel-headers [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh], linux-kernel-headers (>= 2.5.999-test7-bk-15) [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.3-0pre1)
Package: lbxproxy
Deleted: branches/4.3.0/sid/debian/patches/104_sparc_sbus_needs_linux_fb_headers.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/104_sparc_sbus_needs_linux_fb_headers.diff 2004-01-22 18:47:33 UTC (rev 963)
+++ branches/4.3.0/sid/debian/patches/104_sparc_sbus_needs_linux_fb_headers.diff 2004-01-22 20:37:50 UTC (rev 964)
@@ -1,30 +0,0 @@
-$Id$
-
-Sbus.c and xf86Sbus.h use symbols from the Linux fb.h header file.
-
-This patch by Branden Robinson.
-
-Not submitted upstream yet.
-
---- xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c.orig 2004-01-16 14:04:04.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c 2004-01-16 14:19:33.000000000 -0500
-@@ -31,6 +31,9 @@
- #ifdef sun
- #include <sys/utsname.h>
- #endif
-+
-+#include <linux/fb.h> /* for FB_CUR_SETALL and FB_CUR_SETCMAP */
-+
- #include "xf86.h"
- #include "xf86Priv.h"
- #include "xf86_OSlib.h"
---- xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h.orig 2004-01-16 14:34:14.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h 2004-01-16 14:34:01.000000000 -0500
-@@ -26,6 +26,7 @@
- #define _XF86_SBUS_H
-
- #if defined(linux)
-+#include <linux/fb.h> /* for fbcurpos */
- #include <asm/types.h>
- #include <asm/fbio.h>
- #include <asm/openpromio.h>
Reply to: