* Smarter detection of no-op changes to po files.

diff --git a/debian/changelog b/debian/changelog
index b70a7cf899a38b9abd4b0a231ceeee75bab548a0..95811f7f5ea3fd81e317a71a34c196d11aa72818 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,8 +24,9 @@ ikiwiki (1.44) UNRELEASED; urgency=low
     This lets ikiwiki not build depend on perlmagic.
   * Detect old versions of xgettext and avoid using them.
   * perl is broken: print "" || die fails! Work around this insanity.
+  * Smarter detection of no-op changes to po files.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 20 Feb 2007 17:13:37 -0500
+ -- Joey Hess <joeyh@debian.org>  Tue, 20 Feb 2007 18:12:44 -0500
 
 ikiwiki (1.43) unstable; urgency=low
 

diff --git a/po/Makefile b/po/Makefile
index cc931c5a8c9693dcd236084e49166a80171af4d4..52e702e47932c41f5f61cb34f274d32dd5ced0e9 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -29,9 +29,9 @@ clean:
 %.po: ikiwiki.pot
        @echo -n "Merging ikiwiki.pot and $@"
        @msgmerge $@ ikiwiki.pot -o $@.new 2>&1
-# Typically all that changes was a date. I'd prefer not to commit such
-# changes, so detect and ignore them.
-       @if [ "`diff $@ $@.new | grep '[<>]' | wc -l`" -ne 2 ]; then \
+# Typically all that changes was a date or line number. I'd prefer not to
+# commit such changes, so detect and ignore them.
+       @if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \
                mv -f $@.new $@; \
        else \
                rm -f $@.new; \

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index d42394cbdb540ab96b752a5a26ef2b9d70a1cdcd..29673a1d1d79df4c0027f9e5170df8a3746af7f1 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-19 23:10-0500\n"
+"POT-Creation-Date: 2007-02-20 18:12-0500\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"
@@ -449,7 +449,7 @@ msgstr ""
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
-#: ../IkiWiki.pm:558
+#: ../IkiWiki.pm:560
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""