Author: wt Date: 2003-09-19 13:36:17 -0500 (Fri, 19 Sep 2003) New Revision: 555
Added: branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff Removed: branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff Modified: branches/4.3.0/sid/debian/MANIFEST.i386 branches/4.3.0/sid/debian/rules branches/4.3.0/sid/debian/xlibs-dev.install Log: Enabling pkg-config for libX11. The main artifact is that there is now a file called /usr/lib/pkgconfig/X11.pc. Modified: branches/4.3.0/sid/debian/MANIFEST.i386 =================================================================== --- branches/4.3.0/sid/debian/MANIFEST.i386 2003-09-18 21:37:09 UTC (rev 554) +++ branches/4.3.0/sid/debian/MANIFEST.i386 2003-09-19 18:36:17 UTC (rev 555) @@ -6146,6 +6146,7 @@ usr/X11R6/lib/modules/linux/libint10.a usr/X11R6/lib/modules/v10002d.uc usr/X11R6/lib/modules/v20002d.uc +usr/X11R6/lib/pkgconfig/X11.pc usr/X11R6/man/man1/XFree86.1x usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x @@ -7861,6 +7862,7 @@ usr/X11R6/man/man7/Xsecurity.7x usr/bin/dexconf usr/bin/xvfb-run +usr/lib/pkgconfig/X11.pc usr/sbin/update-fonts-alias usr/sbin/update-fonts-dir usr/sbin/update-fonts-scale Deleted: branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff =================================================================== --- branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff 2003-09-18 21:37:09 UTC (rev 554) +++ branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff 2003-09-19 18:36:17 UTC (rev 555) @@ -1,14 +0,0 @@ -$Id$ - -This patch by Ishikawa MUTSUMI. - ---- xc/lib/X11/Imakefile.orig 2003-02-20 11:41:45.000000000 -0500 -+++ xc/lib/X11/Imakefile 2003-02-20 11:41:48.000000000 -0500 -@@ -1087,5 +1087,7 @@ - #else - all:: - -+depend:: -+ - BuildIncludes($(HEADERS),IncSubdir,..) - #endif Added: 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-18 21:37:09 UTC (rev 554) +++ branches/4.3.0/sid/debian/patches/017_x11_pkg_config_enable.diff 2003-09-19 18:36:17 UTC (rev 555) @@ -0,0 +1,56 @@ +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 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ ++ ++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 + Modified: branches/4.3.0/sid/debian/rules =================================================================== --- branches/4.3.0/sid/debian/rules 2003-09-18 21:37:09 UTC (rev 554) +++ branches/4.3.0/sid/debian/rules 2003-09-19 18:36:17 UTC (rev 555) @@ -332,6 +332,11 @@ install -m 644 debian/local/xfs.options.5 $(DEBTREEDIR)/usr/share/man/man5 install -m 755 debian/local/xvfb-run $(DEBTREEDIR)/usr/bin install -m 644 debian/local/xvfb-run.1 $(DEBTREEDIR)/usr/share/man/man1 + + install -m 755 -d $(DEBTREEDIR)/usr/lib/pkgconfig + install -m 644 $(DEBTREEDIR)/usr/X11R6/lib/pkgconfig/X11.pc \ + $(DEBTREEDIR)/usr/lib/pkgconfig/X11.pc + # compare manifests (cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) > debian/MANIFEST.$(ARCH).new # confirm that the installed file list has not changed Modified: branches/4.3.0/sid/debian/xlibs-dev.install =================================================================== --- branches/4.3.0/sid/debian/xlibs-dev.install 2003-09-18 21:37:09 UTC (rev 554) +++ branches/4.3.0/sid/debian/xlibs-dev.install 2003-09-19 18:36:17 UTC (rev 555) @@ -1272,3 +1272,4 @@ usr/X11R6/man/man3/XwcTextListToTextProperty.3x usr/X11R6/man/man3/XwcTextPerCharExtents.3x usr/X11R6/man/man3/XwcTextPropertyToTextList.3x +usr/lib/pkgconfig/X11.pc -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]