X Strike Force SVN commit: rev 568 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-09-22 13:36:52 -0500 (Mon, 22 Sep 2003)
New Revision: 568
Added:
branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff
Removed:
branches/4.3.0/sid/debian/patches/070_x11_pkg_config_enable.diff
Modified:
branches/4.3.0/sid/debian/MANIFEST.alpha
branches/4.3.0/sid/debian/MANIFEST.arm
branches/4.3.0/sid/debian/MANIFEST.hppa
branches/4.3.0/sid/debian/MANIFEST.hurd-i386
branches/4.3.0/sid/debian/MANIFEST.i386
branches/4.3.0/sid/debian/MANIFEST.ia64
branches/4.3.0/sid/debian/MANIFEST.mips
branches/4.3.0/sid/debian/MANIFEST.mipsel
branches/4.3.0/sid/debian/MANIFEST.powerpc
branches/4.3.0/sid/debian/MANIFEST.s390
branches/4.3.0/sid/debian/MANIFEST.sparc
branches/4.3.0/sid/debian/rules
branches/4.3.0/sid/debian/xlibs-dev.install
Log:
Revert Warren Turkal's pkg-config changesets (revisions 555, 565, 566).
Modified: branches/4.3.0/sid/debian/MANIFEST.alpha
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.alpha 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/MANIFEST.alpha 2003-09-22 18:36:52 UTC (rev 568)
@@ -6121,7 +6121,6 @@
usr/X11R6/lib/modules/linux/libfbdevhw.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
@@ -7820,7 +7819,6 @@
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
Modified: branches/4.3.0/sid/debian/MANIFEST.arm
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.arm 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/MANIFEST.arm 2003-09-22 18:36:52 UTC (rev 568)
@@ -6108,7 +6108,6 @@
usr/X11R6/lib/modules/libxf8_16bpp.a
usr/X11R6/lib/modules/libxf8_32bpp.a
usr/X11R6/lib/modules/linux/libfbdevhw.a
-usr/X11R6/lib/pkgconfig/X11.pc
usr/X11R6/man/man1/XFree86.1x
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
@@ -7808,7 +7807,6 @@
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
Modified: branches/4.3.0/sid/debian/MANIFEST.hppa
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.hppa 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/MANIFEST.hppa 2003-09-22 18:36:52 UTC (rev 568)
@@ -6002,7 +6002,6 @@
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxkbui_pic.a
usr/X11R6/lib/libxrx.so.6.3
-usr/X11R6/lib/pkgconfig/X11.pc
usr/X11R6/man/man1/XFree86.1x
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
@@ -7702,7 +7701,6 @@
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
Modified: branches/4.3.0/sid/debian/MANIFEST.hurd-i386
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.hurd-i386 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/MANIFEST.hurd-i386 2003-09-22 18:36:52 UTC (rev 568)
@@ -5960,7 +5960,6 @@
usr/X11R6/lib/modules/libxf8_32bpp.a
usr/X11R6/lib/modules/v10002d.uc
usr/X11R6/lib/modules/v20002d.uc
-usr/X11R6/lib/modules/X11.pc
usr/X11R6/man/man1/XFree86.1x
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
@@ -7673,7 +7672,6 @@
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
Modified: branches/4.3.0/sid/debian/MANIFEST.i386
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.i386 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/MANIFEST.i386 2003-09-22 18:36:52 UTC (rev 568)
@@ -6146,7 +6146,6 @@
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
@@ -7862,7 +7861,6 @@
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
Modified: branches/4.3.0/sid/debian/MANIFEST.ia64
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.ia64 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/MANIFEST.ia64 2003-09-22 18:36:52 UTC (rev 568)
@@ -6143,7 +6143,6 @@
usr/X11R6/lib/modules/linux/libfbdevhw.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
@@ -7857,7 +7856,6 @@
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
Modified: branches/4.3.0/sid/debian/MANIFEST.mips
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.mips 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/MANIFEST.mips 2003-09-22 18:36:52 UTC (rev 568)
@@ -6003,7 +6003,6 @@
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxkbui_pic.a
usr/X11R6/lib/libxrx.so.6.3
-usr/X11R6/lib/pkgconfig/X11.pc
usr/X11R6/man/man1/XFree86.1x
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
@@ -7703,7 +7702,6 @@
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
Modified: branches/4.3.0/sid/debian/MANIFEST.mipsel
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.mipsel 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/MANIFEST.mipsel 2003-09-22 18:36:52 UTC (rev 568)
@@ -6003,7 +6003,6 @@
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxkbui_pic.a
usr/X11R6/lib/libxrx.so.6.3
-usr/X11R6/lib/pkgconfig/X11.pc
usr/X11R6/man/man1/XFree86.1x
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
@@ -7703,7 +7702,6 @@
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
Modified: branches/4.3.0/sid/debian/MANIFEST.powerpc
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.powerpc 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/MANIFEST.powerpc 2003-09-22 18:36:52 UTC (rev 568)
@@ -6118,7 +6118,6 @@
usr/X11R6/lib/modules/libxf8_32bpp.a
usr/X11R6/lib/modules/linux/libdrm.a
usr/X11R6/lib/modules/linux/libfbdevhw.a
-usr/X11R6/lib/pkgconfig/X11.pc
usr/X11R6/man/man1/XFree86.1x
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
@@ -7819,7 +7818,6 @@
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
Modified: branches/4.3.0/sid/debian/MANIFEST.s390
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.s390 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/MANIFEST.s390 2003-09-22 18:36:52 UTC (rev 568)
@@ -5930,7 +5930,6 @@
usr/X11R6/lib/libxkbui.a
usr/X11R6/lib/libxkbui_pic.a
usr/X11R6/lib/libxrx.so.6.3
-usr/X11R6/lib/pkgconfig/X11.pc
usr/X11R6/man/man1/Xmark.1x
usr/X11R6/man/man1/Xnest.1x
usr/X11R6/man/man1/Xserver.1x
@@ -7570,7 +7569,6 @@
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
Modified: branches/4.3.0/sid/debian/MANIFEST.sparc
===================================================================
--- branches/4.3.0/sid/debian/MANIFEST.sparc 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/MANIFEST.sparc 2003-09-22 18:36:52 UTC (rev 568)
@@ -6132,7 +6132,6 @@
usr/X11R6/lib/modules/linux/libfbdevhw.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
@@ -7847,7 +7846,6 @@
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
Copied: branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff (from rev 554, branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff)
Property changes on: branches/4.3.0/sid/debian/patches/017_fix_Xlib_depend_target.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: branches/4.3.0/sid/debian/patches/070_x11_pkg_config_enable.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/070_x11_pkg_config_enable.diff 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/patches/070_x11_pkg_config_enable.diff 2003-09-22 18:36:52 UTC (rev 568)
@@ -1,59 +0,0 @@
-$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
Modified: branches/4.3.0/sid/debian/rules
===================================================================
--- branches/4.3.0/sid/debian/rules 2003-09-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/rules 2003-09-22 18:36:52 UTC (rev 568)
@@ -332,11 +332,6 @@
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-22 17:57:20 UTC (rev 567)
+++ branches/4.3.0/sid/debian/xlibs-dev.install 2003-09-22 18:36:52 UTC (rev 568)
@@ -1272,4 +1272,3 @@
usr/X11R6/man/man3/XwcTextListToTextProperty.3x
usr/X11R6/man/man3/XwcTextPerCharExtents.3x
usr/X11R6/man/man3/XwcTextPropertyToTextList.3x
-usr/lib/pkgconfig/X11.pc
Reply to: