apply the correct metadata (package, version, mail) to all pot and po files

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index b07d4f77f9d04d72a166a95322d1587ac5aa930b..656705038e0265a53e59e42a62280814ab0f1622 100644 (file)
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -51,4 +51,7 @@
 /* The version number string */
 #undef PACKAGE_VERSION
 
+/* The mail address to reach upstream */
+#undef PACKAGE_MAIL
+
 #define APT_8_CLEANER_HEADERS

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 0f0fac09503a9c872e94e29d6bd14904da0f24e0..7ceae70cee5cb6730cd1b325202e620d0323010e 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -3,6 +3,7 @@
 
 PACKAGE = @PACKAGE@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PACKAGE_MAIL = @PACKAGE_MAIL@
 
 # C++ compiler options
 CC = @CC@

diff --git a/configure.in b/configure.in
index 2800fd2f37f96e02b8418ec6a1110c087524f72e..f98f288b1f48d5b0f152b5d62d102716a118a7df 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,10 +19,13 @@ AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildli
 
 PACKAGE="apt"
 PACKAGE_VERSION="0.9.4"
+PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
+AC_DEFINE_UNQUOTED(PACKAGE_MAIL,"$PACKAGE_MAIL")
 AC_SUBST(PACKAGE)
 AC_SUBST(PACKAGE_VERSION)
+AC_SUBST(PACKAGE_MAIL)
 
 dnl Check the archs, we want the target type.
 AC_CANONICAL_SYSTEM

diff --git a/doc/makefile b/doc/makefile
index 4c0a431fd08c873791d20f2cbd4117c30200a2dc..d9542b438b0ade65ffc6e7c24dd59fdfe4538ec0 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -83,14 +83,18 @@ ifdef PO4A
 doc: po4a
 
 update-po:
-       po4a --previous --no-backups --force --no-translations po4a.conf
+       po4a --previous --no-backups --force --no-translations \
+               --package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \
+               --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
 
 po4a:
-       po4a --previous --no-backups po4a.conf
+       po4a --previous --no-backups \
+               --package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \
+               --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
 endif
 
 stats:
-       for i in po/*.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
+       for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done
 
 ifdef DOXYGEN
 DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) )

diff --git a/po/makefile b/po/makefile
index 46b75ff4f721ce814a3716fc0107f13b5367606d..ebf6c06d08c2975ae3248cc21cff3fe3f59d9c45 100644 (file)
--- a/po/makefile
+++ b/po/makefile
@@ -61,7 +61,7 @@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
        cp $@ $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo
 
 stats:
-       for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
+       for i in *.pot *.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done
 
 binary: $(POTFILES) $(MOFILES)
 
@@ -69,8 +69,8 @@ $(PACKAGE)-all.pot: $(POTFILES)
        # 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=$(PACKAGE_VERSION) --msgid-bugs-address=deity@lists.debian.org /dev/null
+               -o $(PO)/$(PACKAGE)-dummy.pot --force-po --package-name='$(PACKAGE)' \
+               --package-version='$(PACKAGE_VERSION)' --msgid-bugs-address='$(PACKAGE_MAIL)' /dev/null
        $(MSGCOMM) --more-than=0 $(PO)/$(PACKAGE)-dummy.pot $(POTFILES) --output=$(PACKAGE)-all.pot
        rm -f $(PO)/$(PACKAGE)-dummy.pot