X Strike Force X.Org X11 SVN commit: r3289 - in trunk/lib/libxfixes/debian: . patches
Author: dnusinow
Date: 2006-09-18 18:08:00 -0400 (Mon, 18 Sep 2006)
New Revision: 3289
Added:
trunk/lib/libxfixes/debian/patches/
trunk/lib/libxfixes/debian/patches/01_include_xlib.h.diff
trunk/lib/libxfixes/debian/patches/series
Modified:
trunk/lib/libxfixes/debian/changelog
trunk/lib/libxfixes/debian/control
trunk/lib/libxfixes/debian/rules
Log:
* Add 01_include_xlib.h.diff. Xfixes.h relies on the "Bool" define from
X11/Xlib.h but did not include that header (directly or indirectly)
(closes: #372756)
Modified: trunk/lib/libxfixes/debian/changelog
===================================================================
--- trunk/lib/libxfixes/debian/changelog 2006-09-18 21:51:49 UTC (rev 3288)
+++ trunk/lib/libxfixes/debian/changelog 2006-09-18 22:08:00 UTC (rev 3289)
@@ -1,10 +1,16 @@
libxfixes (1:4.0.1-4) UNRELEASED; urgency=low
+ [ Drew Parsons ]
* Bring xfixes 4 into unstable (X11R7.1 transition).
* dbg package has priority extra.
- -- Drew Parsons <dparsons@debian.org> Mon, 18 Sep 2006 17:25:12 +1000
+ [ David Nusinow ]
+ * Add 01_include_xlib.h.diff. Xfixes.h relies on the "Bool" define from
+ X11/Xlib.h but did not include that header (directly or indirectly)
+ (closes: #372756)
+ -- David Nusinow <dnusinow@debian.org> Mon, 18 Sep 2006 18:05:48 -0400
+
libxfixes (1:4.0.1-3) experimental; urgency=low
* Add shlibs file due to soversion bump (3.0.0 -> 3.1.0)
Modified: trunk/lib/libxfixes/debian/control
===================================================================
--- trunk/lib/libxfixes/debian/control 2006-09-18 21:51:49 UTC (rev 3288)
+++ trunk/lib/libxfixes/debian/control 2006-09-18 22:08:00 UTC (rev 3289)
@@ -3,7 +3,7 @@
Priority: optional
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>, Drew Parsons <dparsons@debian.org>
-Build-Depends: debhelper (>= 5), libx11-dev (>= 1:0.99.2-1), x11proto-fixes-dev (>= 4.0-1), pkg-config
+Build-Depends: debhelper (>= 5), libx11-dev (>= 1:0.99.2-1), x11proto-fixes-dev (>= 4.0-1), pkg-config, quilt
Standards-Version: 3.7.2
Package: libxfixes3
Added: trunk/lib/libxfixes/debian/patches/01_include_xlib.h.diff
===================================================================
--- trunk/lib/libxfixes/debian/patches/01_include_xlib.h.diff (rev 0)
+++ trunk/lib/libxfixes/debian/patches/01_include_xlib.h.diff 2006-09-18 22:08:00 UTC (rev 3289)
@@ -0,0 +1,12 @@
+Index: libxfixes/include/X11/extensions/Xfixes.h
+===================================================================
+--- libxfixes.orig/include/X11/extensions/Xfixes.h 2006-09-18 18:04:02.000000000 -0400
++++ libxfixes/include/X11/extensions/Xfixes.h 2006-09-18 18:04:21.000000000 -0400
+@@ -48,6 +48,7 @@
+ #include <X11/extensions/xfixeswire.h>
+
+ #include <X11/Xfuncproto.h>
++#include <X11/Xlib.h>
+
+ /*
+ * This revision number also appears in configure.ac, they have
Added: trunk/lib/libxfixes/debian/patches/series
===================================================================
--- trunk/lib/libxfixes/debian/patches/series (rev 0)
+++ trunk/lib/libxfixes/debian/patches/series 2006-09-18 22:08:00 UTC (rev 3289)
@@ -0,0 +1 @@
+01_include_xlib.h.diff
Modified: trunk/lib/libxfixes/debian/rules
===================================================================
--- trunk/lib/libxfixes/debian/rules 2006-09-18 21:51:49 UTC (rev 3288)
+++ trunk/lib/libxfixes/debian/rules 2006-09-18 22:08:00 UTC (rev 3289)
@@ -32,7 +32,7 @@
endif
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -45,7 +45,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
Reply to: