From 1c46aec47a9059d308e21391a8b8e92bd1c41737 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 21 May 2012 15:13:05 +0200
Subject: [PATCH] apply the correct metadata (package, version, mail) to all
 pot and po files

---
 buildlib/config.h.in        |  3 +++
 buildlib/environment.mak.in |  1 +
 configure.in                |  3 +++
 doc/makefile                | 10 +++++++---
 po/makefile                 |  6 +++---
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index b07d4f77f..656705038 100644
--- 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 0f0fac095..7ceae70ce 100644
--- 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 2800fd2f3..f98f288b1 100644
--- 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 4c0a431fd..d9542b438 100644
--- 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 46b75ff4f..ebf6c06d0 100644
--- 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
 
-- 
2.45.2