Package: xfree86
Version: 4.3.0.dfsg.1-6+SVN (r1741)
Severity: important
Tags: patch
Hi,
While building r1741 to test the patch on #260099, I got a FTBFS in
the MANIFEST check. The problem here is that one sort uses LC_ALL=C
and the others does not, so if the current locale is different from C
it will use a differenr sorting order.
On my build system I had LANG=C, LC_COLLATE=ca_ES and LC_CTYPE=ca_ES.
Attached is a trivial patch (against trunk's HEAD) that solves this
possible problem, thus not RC severity, although I think it should
get into -6.
regards,
guillem
Index: rules
===================================================================
--- rules (revision 1755)
+++ rules (working copy)
@@ -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
