diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-02-20 04:10:31 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-02-20 04:10:31 +0000 |
| commit | 8b3a840a745855ecbbcc207026306449c21fb3b4 (patch) | |
| tree | 4029929f04e57aad21a67b18b7f474885a57a95b | |
| parent | 2725887734c318350875501e64561f79b8866dfe (diff) | |
| download | ikiwiki-8b3a840a745855ecbbcc207026306449c21fb3b4.tar ikiwiki-8b3a840a745855ecbbcc207026306449c21fb3b4.tar.gz | |
* Detect old versions of xgettext and avoid using them.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/bugs/xgettext_issue.mdwn | 4 | ||||
| -rw-r--r-- | po/Makefile | 6 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index b51b7b441..bcf83ac4c 100644 --- 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. + * 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 diff --git a/doc/bugs/xgettext_issue.mdwn b/doc/bugs/xgettext_issue.mdwn index 5abc65c04..dc49c69a1 100644 --- 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? +>>>>>>> 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 a415854a2..cc931c5a8 100644 --- a/po/Makefile +++ b/po/Makefile @@ -15,8 +15,10 @@ install: all 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 diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 340a84760..d42394cbd 100644 --- 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 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" |