From a11afb9d0dd5d2326acb2de19ea20b49238667d0 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 21 Mar 2012 23:47:54 +0100
Subject: do not update po and pot files in the process of the build as this
 causes timestamp changes for the mo files which therefore can't be refcounted
 by dpkg for your M-A: same packages (Closes: #659333, LP: #924628)

The commit also enables a top-level 'make update-po' and does
all the needed changes to let this work now that update-po might
be called in a freshly checkout tree
---
 doc/makefile | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'doc/makefile')

diff --git a/doc/makefile b/doc/makefile
index 4fcf3bd10..fca0bfa0d 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -67,26 +67,21 @@ veryclean-subdirs:
 		rm -rf $$dir; \
 	done
 
+.PHONY: update-po po4a stats
+
 ifdef PO4A
 doc: po4a
 
-clean: po4a-clean
-
-.PHONY: update-po po4a stats
 update-po:
 	po4a --previous --no-backups --force --no-translations po4a.conf
 
-po4a-clean:
-	po4a --previous --rm-backups --rm-translations po4a.conf
-
 po4a:
 	po4a --previous --no-backups po4a.conf
+endif
 
 stats:
 	for i in po/*.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
 
-endif
-
 ifdef DOXYGEN
 DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) )
 
-- 
cgit v1.2.3


From 9179f697ed4796a86f820b516f034fd679e48be4 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 22 Mar 2012 00:16:11 +0100
Subject: the previously used VERSION didn't work everywhere so we are
 switching to the more standard PACKAGE_VERSION and make it work in every file

---
 doc/makefile | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'doc/makefile')

diff --git a/doc/makefile b/doc/makefile
index fca0bfa0d..0817821b6 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -91,9 +91,6 @@ doxygen-clean:
 	rm -fr $(BUILD)/doc/doxygen
 	rm -f $(BUILD)/doc/doxygen-stamp
 
-$(BUILD)/doc/Doxyfile: Doxyfile.in
-	(cd $(BUILD) && ./config.status doc/Doxyfile)
-
 $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile
 	rm -fr $(BUILD)/doc/doxygen
 	mkdir $(BUILD)/doc/doxygen  # some versions seem to not create this directory #628799
-- 
cgit v1.2.3


From fd4bd9029ee0fe03c18187cd11ae4576c5e47379 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 4 Apr 2012 23:04:57 +0200
Subject: apt-verbatim.ent is an INCLUDE file as well

---
 doc/makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/makefile')

diff --git a/doc/makefile b/doc/makefile
index 0817821b6..df2ddb25f 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -15,7 +15,7 @@ include $(DEBIANDOC_H)
 ifdef XSLTPROC
 # generate a list of accepted man page translations
 SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml))
-INCLUDES = apt.ent
+INCLUDES = apt.ent apt-verbatim.ent
 STYLESHEET=manpage-style.xsl
 
 LOCAL := manpage-$(firstword $(SOURCE))
-- 
cgit v1.2.3