Sorting for libc message catalog (LL.po file)

[Bruno Haible]

Karl Eichwalder writes:

> Warning: there is a second '-s' hidden when all the
> sub-potfiles are merged together using xgettext.

Ouch, I missed this one. Here is a patch to remove the undesired sorting
of libc.pot. Also change po/header.pot to match the current output of
xgettext when --omit-header is not given.


2002-05-16  Bruno Haible  <bruno@clisp.org>

	* MakeTAGS (libc.pot): Don't sort the output.
	* po/header.pot: Update to match xgettext 0.11 output.

--- glibc-20020425/MakeTAGS.bak	Mon Apr 22 13:44:46 2002
+++ glibc-20020425/MakeTAGS	Thu May 16 01:37:14 2002
@@ -172,7 +172,7 @@
 	sed -e 's/VERSION/$(version)/' \
 	    -e "s/DATE/`date +'%Y-%m-%d %H:%M'$$disp`/" \
 	    po/header.pot > $@.new
-	$(XGETTEXT) -d - --omit-header -n -s $^ >> $@.new
+	$(XGETTEXT) -d - --omit-header -n $^ >> $@.new
 	mv -f $@.new $@
 ifeq ($(with-cvs),yes)
 	test ! -d CVS || cvs $(CVSOPTS) ci -m'Regenerated from source files' $@
--- glibc-20020425/po/header.pot.bak	Tue Sep  7 17:04:27 1999
+++ glibc-20020425/po/header.pot	Thu May 16 01:40:30 2002
@@ -7,10 +7,10 @@
 msgstr ""
 "Project-Id-Version: libc VERSION\n"
 "POT-Creation-Date: DATE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+DIST\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"