* Detect old versions of xgettext and avoid using them.

diff --git a/debian/changelog b/debian/changelog
index b51b7b4413b58fd524d816e856f32074e669ec0a..bcf83ac4c1cc26b8af780d7d17e1cb7852d223c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,9 @@ ikiwiki (1.44) UNRELEASED; urgency=low
     to fragile to let it kill ikiwiki.
   * Make img plugin not fail immediately if Image::Magick is not available.
     This lets ikiwiki not build depend on perlmagic.
     to fragile to let it kill ikiwiki.
   * Make img plugin not fail immediately if Image::Magick is not available.
     This lets ikiwiki not build depend on perlmagic.

+  * Detect old versions of xgettext and avoid using them.

 
 

- -- Joey Hess <joeyh@debian.org>  Mon, 19 Feb 2007 22:12:25 -0500
+ -- Joey Hess <joeyh@debian.org>  Mon, 19 Feb 2007 23:02:17 -0500

 
 ikiwiki (1.43) unstable; urgency=low
 
 
 ikiwiki (1.43) unstable; urgency=low
 

diff --git a/doc/bugs/xgettext_issue.mdwn b/doc/bugs/xgettext_issue.mdwn
index 5abc65c04e18b423f77ebaa749f0e5284fe62829..dc49c69a1805062a5220ece158c7453652292d20 100644 (file)
--- a/doc/bugs/xgettext_issue.mdwn
+++ b/doc/bugs/xgettext_issue.mdwn
@@ -67,3 +67,7 @@ make: *** [extra_build] Error 2
 
 >>>>>> Other than installing a newer version of `gettext` from outside of the repos, is there any workaround?  
 
 
 >>>>>> Other than installing a newer version of `gettext` from outside of the repos, is there any workaround?  
 

+>>>>>>> It's probably because you're pulling it from svn, and I don't
+>>>>>>> always update the pot file every time I commit to svn. So this will
+>>>>>>> affect svn checkouts, but not released tarballs. Anyway, I put in a
+>>>>>>> workaround.. [[bugs/done]] --[[Joey]]

diff --git a/po/Makefile b/po/Makefile
index a415854a2afabf1c1eefe5eca6e3ec6169c82a49..cc931c5a8c9693dcd236084e49166a80171af4d4 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -15,8 +15,10 @@ install: all
        done
 
 ikiwiki.pot: $(POTFILES)
        done
 
 ikiwiki.pot: $(POTFILES)

-       @echo "Rebuilding the pot file"
-       xgettext $(POTFILES) -o ikiwiki.pot -Lperl --add-comments=translators
+       @if perl -e '($$ver)=`xgettext -V | head -n 1`=~/.*\s+([0-9]+\.[0-9]+)/; die "gettext $$ver too old, not updating the pot file\n" if $$ver < 0.16'; then \
+               echo "Rebuilding the pot file"; \
+               xgettext $(POTFILES) -o ikiwiki.pot -Lperl --add-comments=translators; \
+       fi

 
 clean:
        rm -f $(MOFILES) messages messages.mo
 
 clean:
        rm -f $(MOFILES) messages messages.mo

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 340a847604843ccd1800f0487e12789a8c6362f8..d42394cbdb540ab96b752a5a26ef2b9d70a1cdcd 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"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-02-19 22:59-0500\n"
+"POT-Creation-Date: 2007-02-19 23:10-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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"