X Strike Force SVN commit: rev 566 - branches/4.3.0/sid/debian/patches
Author: branden
Date: 2003-09-22 11:18:32 -0500 (Mon, 22 Sep 2003)
New Revision: 566
Added:
branches/4.3.0/sid/debian/patches/070_x11_pkg_config_enable.diff
Removed:
branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff
Log:
Renumber Warren Turkal's libX11 pkg-config patch under the
confusion-minimization principle.
Also, add $Id$ expando and set svn:keywords property to "Id" on the patch
file.
Deleted: branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff 2003-09-22 03:02:17 UTC (rev 565)
+++ branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff 2003-09-22 16:18:32 UTC (rev 566)
@@ -1,56 +0,0 @@
-diff -r -u3 -N xc/lib/X11/Imakefile 017_x11-pkg-config-enable.diff/xc/lib/X11/Imakefile
---- xc/lib/X11/Imakefile 2002-11-25 20:31:23.000000000 -0600
-+++ xc/lib/X11/Imakefile 2003-09-18 04:23:45.000000000 -0500
-@@ -1089,3 +1089,22 @@
-
- BuildIncludes($(HEADERS),IncSubdir,..)
- #endif
-+
-+
-+SUBSTVARS=prefix="$(PROJECTROOT)" \
-+ exec_prefix="$(BINDIR)" \
-+ libdir="$(USRLIBDIR)" \
-+ includedir="$(INCROOT)" \
-+ PACKAGE_VERSION="$(SOXLIBREV)" \
-+
-+all:: X11.pc
-+
-+X11.pc: X11.pc.in
-+ RemoveFile($@)
-+ sh config/config-subst $(SUBSTVARS) < X11.pc.in > $@
-+
-+InstallNonExecFile(X11.pc,$(USRLIBDIR)/pkgconfig)
-+
-+clean::
-+ RemoveFile(X11.pc)
-+
-diff -r -u3 -N xc/lib/X11/X11.pc.in 017_x11-pkg-config-enable.diff/xc/lib/X11/X11.pc.in
---- xc/lib/X11/X11.pc.in 1969-12-31 18:00:00.000000000 -0600
-+++ xc/lib/X11/X11.pc.in 2003-09-18 04:23:45.000000000 -0500
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: X11
-+Description: X11 library
-+Version: @PACKAGE_VERSION@
-+Requires: fontconfig
-+Libs: -L${libdir} -lX11
-+Cflags: -I${includedir}
-diff -r -u3 -N xc/lib/X11/config/config-subst 017_x11-pkg-config-enable.diff/xc/lib/X11/config/config-subst
---- xc/lib/X11/config/config-subst 1969-12-31 18:00:00.000000000 -0600
-+++ xc/lib/X11/config/config-subst 2003-09-18 04:23:45.000000000 -0500
-@@ -0,0 +1,10 @@
-+#!/bin/sh
-+script=config-subst.$$
-+trap "rm $script" 0
-+rm -f $script
-+for i in ${1+"$@"}; do
-+ var="`echo "$i" | sed 's/=.*$//'`"
-+ val="`echo "$i" | sed 's/^[^=]*=//'`"
-+ echo "s;@$var@;$val;" >> $script
-+done
-+sed -f $script
-
Copied: branches/4.3.0/sid/debian/patches/070_x11_pkg_config_enable.diff (from rev 565, branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff)
===================================================================
--- branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff 2003-09-22 03:02:17 UTC (rev 565)
+++ branches/4.3.0/sid/debian/patches/070_x11_pkg_config_enable.diff 2003-09-22 16:18:32 UTC (rev 566)
@@ -0,0 +1,59 @@
+$Id$
+
+This patch by Warren Turkal.
+
+diff -r -u3 -N xc/lib/X11/Imakefile 017_x11-pkg-config-enable.diff/xc/lib/X11/Imakefile
+--- xc/lib/X11/Imakefile 2002-11-25 20:31:23.000000000 -0600
++++ xc/lib/X11/Imakefile 2003-09-18 04:23:45.000000000 -0500
+@@ -1089,3 +1089,22 @@
+
+ BuildIncludes($(HEADERS),IncSubdir,..)
+ #endif
++
++
++SUBSTVARS=prefix="$(PROJECTROOT)" \
++ exec_prefix="$(BINDIR)" \
++ libdir="$(USRLIBDIR)" \
++ includedir="$(INCROOT)" \
++ PACKAGE_VERSION="$(SOXLIBREV)" \
++
++all:: X11.pc
++
++X11.pc: X11.pc.in
++ RemoveFile($@)
++ sh config/config-subst $(SUBSTVARS) < X11.pc.in > $@
++
++InstallNonExecFile(X11.pc,$(USRLIBDIR)/pkgconfig)
++
++clean::
++ RemoveFile(X11.pc)
++
+diff -r -u3 -N xc/lib/X11/X11.pc.in 017_x11-pkg-config-enable.diff/xc/lib/X11/X11.pc.in
+--- xc/lib/X11/X11.pc.in 1969-12-31 18:00:00.000000000 -0600
++++ xc/lib/X11/X11.pc.in 2003-09-18 04:23:45.000000000 -0500
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: X11
++Description: X11 library
++Version: @PACKAGE_VERSION@
++Requires: fontconfig
++Libs: -L${libdir} -lX11
++Cflags: -I${includedir}
+diff -r -u3 -N xc/lib/X11/config/config-subst 017_x11-pkg-config-enable.diff/xc/lib/X11/config/config-subst
+--- xc/lib/X11/config/config-subst 1969-12-31 18:00:00.000000000 -0600
++++ xc/lib/X11/config/config-subst 2003-09-18 04:23:45.000000000 -0500
+@@ -0,0 +1,10 @@
++#!/bin/sh
++script=config-subst.$$
++trap "rm $script" 0
++rm -f $script
++for i in ${1+"$@"}; do
++ var="`echo "$i" | sed 's/=.*$//'`"
++ val="`echo "$i" | sed 's/^[^=]*=//'`"
++ echo "s;@$var@;$val;" >> $script
++done
++sed -f $script
Property changes on: branches/4.3.0/sid/debian/patches/070_x11_pkg_config_enable.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: