X Strike Force Xrender SVN commit: rev 56 - trunk/debian
Author: branden
Date: 2003-10-06 23:36:19 -0500 (Mon, 06 Oct 2003)
New Revision: 56
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/libxrender-dev.install
trunk/debian/libxrender1-dbg.install
trunk/debian/libxrender1.install
trunk/debian/rules
Log:
Move files from /usr/X11R6 to /usr where possible. (The only exception is the
Xrender.h, which is expected to be found in <X11/extensions/Xrender.h>, so has
to be shipped in /usr/X11R6/include/X11/extensions.)
- debian/*.install: update paths
- debian/rules: stop passing --includedir and --libdir to configure
- debian/control: update instructions for using LD_LIBRARY_PATH
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-10-07 04:07:47 UTC (rev 55)
+++ trunk/debian/changelog 2003-10-07 04:36:19 UTC (rev 56)
@@ -7,8 +7,16 @@
- debian/rules: translated to CDBS-speak
- debian/*.install: update to be correct with the way CDBS uses dh_install
- -- Branden Robinson <branden@debian.org> Mon, 6 Oct 2003 23:06:11 -0500
+ * Move files from /usr/X11R6 to /usr where possible. (The only exception is
+ the Xrender.h, which is expected to be found in
+ <X11/extensions/Xrender.h>, so has to be shipped in
+ /usr/X11R6/include/X11/extensions.)
+ - debian/*.install: update paths
+ - debian/rules: stop passing --includedir and --libdir to configure
+ - debian/control: update instructions for using LD_LIBRARY_PATH
+ -- Branden Robinson <branden@debian.org> Mon, 6 Oct 2003 23:33:00 -0500
+
xrender (0.8.2-2) unstable; urgency=low
* debian/control: sync with overrides file; libxrender1-dbg is priority
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2003-10-07 04:07:47 UTC (rev 55)
+++ trunk/debian/control 2003-10-07 04:36:19 UTC (rev 56)
@@ -36,8 +36,8 @@
useful to provide a backtrace with symbol names in a debugger; this
facilitates interpretation of core dumps, and aids in finding logic errors in
programs using this library (or the library itself). The library is
- installed in /usr/X11R6/lib/debug and can be used by placing that directory
- in the LD_LIBRARY_PATH environment variable when the code to be debugged is
+ installed in /usr/lib/debug and can be used by placing that directory in the
+ LD_LIBRARY_PATH environment variable when the code to be debugged is
executed. Non-programmers will likely have little use for this package, and
should use libxrender1 instead.
Modified: trunk/debian/libxrender-dev.install
===================================================================
--- trunk/debian/libxrender-dev.install 2003-10-07 04:07:47 UTC (rev 55)
+++ trunk/debian/libxrender-dev.install 2003-10-07 04:36:19 UTC (rev 56)
@@ -1,5 +1,5 @@
-debian/tmp/usr/X11R6/include/X11/extensions/Xrender.h
-debian/tmp/usr/X11R6/lib/libXrender.a
-debian/tmp/usr/X11R6/lib/libXrender.la
-debian/tmp/usr/X11R6/lib/libXrender.so
-debian/tmp/usr/X11R6/lib/pkgconfig/xrender.pc usr/lib/pkgconfig/
+debian/tmp/usr/include/X11/extensions/Xrender.h usr/X11R6/include/X11/extensions/
+debian/tmp/usr/lib/libXrender.a
+debian/tmp/usr/lib/libXrender.la
+debian/tmp/usr/lib/libXrender.so
+debian/tmp/usr/lib/pkgconfig/xrender.pc
Modified: trunk/debian/libxrender1-dbg.install
===================================================================
--- trunk/debian/libxrender1-dbg.install 2003-10-07 04:07:47 UTC (rev 55)
+++ trunk/debian/libxrender1-dbg.install 2003-10-07 04:36:19 UTC (rev 56)
@@ -1,2 +1,2 @@
-debian/tmp/usr/X11R6/lib/libXrender.so.1 usr/X11R6/lib/debug/
-debian/tmp/usr/X11R6/lib/libXrender.so.1.2.2 usr/X11R6/lib/debug/
+debian/tmp/usr/lib/libXrender.so.1 usr/lib/debug/
+debian/tmp/usr/lib/libXrender.so.1.2.2 usr/lib/debug/
Modified: trunk/debian/libxrender1.install
===================================================================
--- trunk/debian/libxrender1.install 2003-10-07 04:07:47 UTC (rev 55)
+++ trunk/debian/libxrender1.install 2003-10-07 04:36:19 UTC (rev 56)
@@ -1,2 +1,2 @@
-debian/tmp/usr/X11R6/lib/libXrender.so.1
-debian/tmp/usr/X11R6/lib/libXrender.so.1.2.2
+debian/tmp/usr/lib/libXrender.so.1
+debian/tmp/usr/lib/libXrender.so.1.2.2
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2003-10-07 04:07:47 UTC (rev 55)
+++ trunk/debian/rules 2003-10-07 04:36:19 UTC (rev 56)
@@ -8,7 +8,7 @@
# Don't trust AC_PATH_X; tell upstream configure script where to find X
# libraries and headers on a Debian system.
-DEB_CONFIGURE_EXTRA_FLAGS := --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib --includedir=/usr/X11R6/include --libdir=/usr/X11R6/lib
+DEB_CONFIGURE_EXTRA_FLAGS := --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
# Library interface did not change in Xrender 0.8.2 or 0.8.3.
DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libxrender1 (>= 0.8.1)"
Reply to: