X Strike Force XFree86 SVN commit: r1756 - trunk/debian
Author: branden
Date: 2004-08-28 00:49:17 -0500 (Sat, 28 Aug 2004)
New Revision: 1756
Modified:
trunk/debian/CHANGESETS
trunk/debian/rules
Log:
Don't run "sort" without setting LC_ALL=C, or unexpected things will
happen. Thanks to Guillem Jover for diagnosing this problem (see Debian
#268116).
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-08-25 17:00:50 UTC (rev 1755)
+++ trunk/debian/CHANGESETS 2004-08-28 05:49:17 UTC (rev 1756)
@@ -143,7 +143,7 @@
+ Reduce the build time by 20 to 30 percent when the "binary-arch" target
is used (ccache users might see even more improvement).
+ Make the buildd admins hate us less.
- 1658, 1659, 1661, 1670, 1671, 1679, 1681
+ 1658, 1659, 1661, 1670, 1671, 1679, 1681, 1756
Fix missing element of Debian X FAQ conversion to XHTML; correct
s390-specific version of xfree86-common dh_installdocs file to recognize
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2004-08-25 17:00:50 UTC (rev 1755)
+++ trunk/debian/rules 2004-08-28 05:49:17 UTC (rev 1756)
@@ -352,12 +352,12 @@
# Construct MANIFEST files from MANIFEST.$(ARCH).in and
# MANIFEST.$(ARCH).all or MANIFEST.all.
if expr "$(findstring -DBuildFonts=NO,$(IMAKE_DEFINES))" : "-DBuildFonts=NO" >/dev/null 2>&1; then \
- sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); \
+ LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH); \
else \
if [ -e debian/MANIFEST.$(ARCH).all ]; then \
- sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \
+ LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \
else \
- sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all >debian/MANIFEST.$(ARCH); \
+ LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all >debian/MANIFEST.$(ARCH); \
fi; \
fi
# confirm that the installed file list has not changed
Reply to: