From kde-commits  Wed Apr 27 12:57:03 2005
From: David Faure <faure () kde ! org>
Date: Wed, 27 Apr 2005 12:57:03 +0000
To: kde-commits
Subject: kde-common/admin
Message-Id: <20050427125703.B218A630 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=111460664720995

CVS commit by faure: 

Prevent "make -f admin/Makefile.common package-messages" from committing meaningless
changes to .pot files like line number changes, or different order of the messages.
Blessed by coolo.


  M +7 -6      cvs.sh   1.156


--- kde-common/admin/cvs.sh  #1.155:1.156
@@ -586,5 +586,5 @@
 
 for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
-  egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > po.backup/$i
+  egrep -v '^#' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > po.backup/$i
   cat po/$i > po.backup/backup_$i
   touch -r po/$i po.backup/backup_$i
@@ -598,9 +598,9 @@
 done
 for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
-   sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
-   #msgmerge -q -o po/$i po/$i po/$i
-   egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
+  sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
+  #msgmerge -q -o po/$i po/$i po/$i
+  egrep -v '^#' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
   if test -f po.backup/$i && ! cmp -s temp.pot po.backup/$i; then
-        echo "will update $i"
+    echo "will update $i"
   else
     if test -f po.backup/backup_$i; then
@@ -617,5 +617,6 @@
 }
 
-unset LC_ALL || :
+# Make sure that sorting is always done the same way
+export LC_ALL=C
 unset LANG || :
 unset LC_CTYPE || :