summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2012-04-04 11:28:24 -0700
committerSteve Langasek <steve.langasek@canonical.com>2012-04-04 11:28:24 -0700
commitdfcf5617db6ed3e5a1878aa4f4332e64cec29668 (patch)
tree462b76531328ee44201fb1a091f9a74cd9fbce9f
parent7cf3e9a75ace344416da4d53d723768cee088e76 (diff)
parent16c977d2b71a016ee9671d60678ba32e130fae04 (diff)
Merge fix for bug #924628
-rw-r--r--Makefile1
-rw-r--r--debian/changelog4
-rw-r--r--po/makefile22
3 files changed, 23 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 9a47014c3..ee5de1ecc 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ all headers library clean veryclean binary program doc dirs test:
# Some very common aliases
.PHONY: maintainer-clean dist-clean distclean pristine sanity
maintainer-clean dist-clean distclean pristine sanity: veryclean
+veryclean: clean
# The startup target builds the necessary configure scripts. It should
# be used after a CVS checkout.
diff --git a/debian/changelog b/debian/changelog
index 9fe896f22..cab53d034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ apt (0.8.16~exp12ubuntu7) UNRELEASED; urgency=low
* Build-depend on gettext:any for cross-building support.
* Don't treat build-depends-indep as cross-build-dependencies; we should
always install the host arch versions. LP: #968828.
+ * Makefile, po/makefile: make sure our pot generation datestamp doesn't
+ change at build time, since this makes translations fail to be
+ co-installable with multiarch. Based on a patch by David Kalnischkies.
+ Closes: #659333, LP: #924628.
-- Steve Langasek <steve.langasek@ubuntu.com> Sat, 24 Mar 2012 00:05:43 -0700
diff --git a/po/makefile b/po/makefile
index d2fb8d280..81dd362a2 100644
--- a/po/makefile
+++ b/po/makefile
@@ -40,13 +40,23 @@ $(POTFILES) : $(PO)/%.pot :
--keyword=P_:1,2 \
--files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot
rm -f $(PO)/POTFILES_$*.in
- $(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@
+ $(MSGCOMM) --omit-header --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@
# copy into the domain dirs to make rosetta happy
rm -f $(PO)/domains/$*/*.pot
cp $@ $(PO)/domains/$*
-$(PACKAGE)-all.pot: $(POTFILES)
- $(MSGCOMM) --more-than=0 $(POTFILES) --output=$@
+$(PACKAGE)-all.pot:
+ # we create our partial pot files without a header to avoid
+ # changing dates in *.mo files, but we want a header for our
+ # master-pot file, so we use a dummy pot with nothing but the
+ # header
+ $(XGETTEXT) --default-domain=$(PO)/$(PACKAGE)-dummy.pot --foreign \
+ --language=c -o $(PO)/$(PACKAGE)-dummy.pot --force-po \
+ --package-name=$(PACKAGE) --package-version=$(VERSION) \
+ --msgid-bugs-address=deity@lists.debian.org /dev/null
+ make $(POTFILES)
+ $(MSGCOMM) --more-than=0 $(PO)/$(PACKAGE)-dummy.pot $(POTFILES) --output=$@
+ rm -f $(PO)/$(PACKAGE)-dummy.pot
# Filter the complete translation with the domain specific file to produce
# only the subtext needed for this domain
@@ -81,7 +91,11 @@ update-po: $(PACKAGE)-all.pot
rm -f $$lang.new.po; \
done
-clean: clean/local
+check-pot-deps:
+ echo $(PACKAGE)-all.pot : $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/*/*.srclist))) >> $(PO)/apt-all.d
+ make $(PACKAGE)-all.pot
+
+clean: check-pot-deps clean/local
clean/local: update-po
rm -f $(MOFILES) $(LANG_POFILES) $(PO)/*.d