X Strike Force Xrender SVN commit: r98 - trunk/debian
Author: branden
Date: 2005-05-09 14:11:47 -0500 (Mon, 09 May 2005)
New Revision: 98
Modified:
trunk/debian/changelog
trunk/debian/libxrender-dev.install
trunk/debian/rules
Log:
Check in Josh Triplett's preparation of 1:0.8.3-1:
+ Tell configure to put include files in /usr/X11R6/include, rather than
installing include files from debian/tmp/usr/include to
/usr/X11R6/include, which caused pkg-config and libtool to think they
should be in /usr/include. (Closes: #257187, #280092)
- debian/rules: set DEB_CONFIGURE_INCLUDEDIR.
- debian/libxrender-dev.install: Install Xrender.h from
/usr/X11R6/include, rather than moving it from /usr/include.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-03-10 06:05:01 UTC (rev 97)
+++ trunk/debian/changelog 2005-05-09 19:11:47 UTC (rev 98)
@@ -1,3 +1,21 @@
+xrender (1:0.8.3-1) unstable; urgency=low
+
+ * Sponsored upload of package prepared at Branden's request by Josh Triplett
+ <josh@freedesktop.org>.
+
+ * Re-upload 0.8.3-1 as epoched version 1:0.8.3-1 to supersede hijack of
+ package.
+
+ * Tell configure to put include files in /usr/X11R6/include, rather than
+ installing include files from debian/tmp/usr/include to
+ /usr/X11R6/include, which caused pkg-config and libtool to think they
+ should be in /usr/include. (Closes: #257187, #280092)
+ - debian/rules: set DEB_CONFIGURE_INCLUDEDIR.
+ - debian/libxrender-dev.install: Install Xrender.h from
+ /usr/X11R6/include, rather than moving it from /usr/include.
+
+ -- Branden Robinson <branden@debian.org> Mon, 9 May 2005 14:05:22 -0500
+
xrender (0.8.3-7) unstable; urgency=medium
* Urgency due to fix for FTBFS.
Modified: trunk/debian/libxrender-dev.install
===================================================================
--- trunk/debian/libxrender-dev.install 2004-03-10 06:05:01 UTC (rev 97)
+++ trunk/debian/libxrender-dev.install 2005-05-09 19:11:47 UTC (rev 98)
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/X11/extensions/Xrender.h usr/X11R6/include/X11/extensions/
+debian/tmp/usr/X11R6/include/X11/extensions/Xrender.h
debian/tmp/usr/lib/libXrender.a
debian/tmp/usr/lib/libXrender.la
debian/tmp/usr/lib/libXrender.so
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2004-03-10 06:05:01 UTC (rev 97)
+++ trunk/debian/rules 2005-05-09 19:11:47 UTC (rev 98)
@@ -6,4 +6,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+# Put include files in /usr/X11R6/include.
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/X11R6/include"
+
# vim:set ai tw=0 sw=2 sts=2:
Reply to: