Author: branden
Date: 2003-07-03 11:24:34 -0500 (Thu, 03 Jul 2003)
New Revision: 288
Modified:
trunk/debian/changelog
trunk/debian/rules
trunk/debian/scripts/patch.apply
trunk/debian/scripts/patch.unapply
Log:
debian/rules: stop setting LC_COLLATE
debian/scripts/patch.{apply,unapply}: set LC_COLLATE to C before iterating
over patch files
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog 2003-07-03 16:20:38 UTC (rev 287)
+++ trunk/debian/changelog 2003-07-03 16:24:34 UTC (rev 288)
@@ -1,11 +1,13 @@
xfree86 (4.2.1-10) unstable; urgency=low
- * the "glibc, will you be my friend?" release
-
* debian/scripts/manifest-install-reconcile: new script to help keep
MANIFEST and *.install* files in sync
- * use above script to find and fix several bugs in *.install* files:
+ * debian/scripts/patch.{apply,unapply}: set LC_COLLATE=C to ensure that
+ patches are applied in the correct order
+
+ * use manifest-install-reconcile script to find and fix several bugs in
+ *.install* files:
- xlibs-dev.install.{,netbsd-i386,s390}: ship several missing extension
header files: XLbx.h, bigreqstr.h, extutil.h, mitmiscstr.h,
multibufst.h, shapestr.h, shmstr.h, syncstr.h, xcmiscstr.h, xteststr.h
@@ -22,8 +24,6 @@
darwinLib.{rules,tmpl} Imake configuration files
- xutils.install.{m68k,s390}: ship luit program, its manpage, and
darwinLib.{rules,tmpl} Imake configuration files
-
- * debian/rules: force LC_COLLATE=C so as not to break the patch order.
-- Branden Robinson <[EMAIL PROTECTED]> Wed, 2 Jul 2003 15:00:37 -0500
Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules 2003-07-03 16:20:38 UTC (rev 287)
+++ trunk/debian/rules 2003-07-03 16:24:34 UTC (rev 288)
@@ -26,9 +26,6 @@
# oh my God, this is a gross hack
ELSE:=else
-# horrific hack to work around LC_COLLATE braindamage: ensure that patches
-# actually get applied in the right order.
-LC_COLLATE=C
# This is a horrendous kludge to ensure that some scripts we need are executable.
DUMMY:=$(shell if [ ! -x debian/setperms ]; then chmod 755 debian/setperms; fi)
Modified: trunk/debian/scripts/patch.apply
==============================================================================
--- trunk/debian/scripts/patch.apply 2003-07-03 16:20:38 UTC (rev 287)
+++ trunk/debian/scripts/patch.apply 2003-07-03 16:24:34 UTC (rev 288)
@@ -4,6 +4,8 @@
[ ! -d debian/patches ] && exit
+LC_COLLATE=C
+
mkdir -p $STAMP_DIR/patches $SOURCE_TREE
for f in $(find debian/patches \( -type f -or -type l \) -not -name "*~" | sort); do
Modified: trunk/debian/scripts/patch.unapply
==============================================================================
--- trunk/debian/scripts/patch.unapply 2003-07-03 16:20:38 UTC (rev 287)
+++ trunk/debian/scripts/patch.unapply 2003-07-03 16:24:34 UTC (rev 288)
@@ -2,6 +2,8 @@
. debian/scripts/vars
+LC_COLLATE=C
+
mkdir -p $STAMP_DIR/patches/
for f in $(find debian/patches -type f -not -name "*~" | sort -r); do
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
