[SCM] hydrogen/master: Put aside upstream-generated docs during build and regenerate ourselves.

js at users.alioth.debian.org js at users.alioth.debian.org
Fri Mar 18 01:02:41 UTC 2011


The following commit has been merged in the master branch:
commit a93c5e2670e11451da0e8fcbeb7d149b8760a599
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Mar 18 01:18:57 2011 +0100

    Put aside upstream-generated docs during build and regenerate ourselves.

diff --git a/debian/rules b/debian/rules
index 9d5e8d8..a399ed9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,28 @@ DEB_SCONS_INSTALL_OPTIONS = DESTDIR=$(DEB_DESTDIR)
 DEB_INSTALL_MANPAGES_hydrogen = debian/hydrogen.1
 DEB_INSTALL_EXAMPLES_hydrogen = extra/serverTools
 
+# Put aside upstream-shipped autogenerated files during build
+upstreamtmpfiles = $(wildcard data/doc/*.html data/doc/*.docbook)
+upstreamtmpfiles_ = $(patsubst %.upstream,%,$(wildcard data/doc/*.html.upstream data/doc/*.docbook.upstream))
+pre-build:: debian/stamp-upstreamtmpstuff
+debian/stamp-upstreamtmpstuff: debian/stamp-copyright-check
+	for file in $(upstreamtmpfiles); do \
+		[ ! -e $$file ] || [ -e $$file.upstream ] || mv $$file $$file.upstream; \
+	done
+	touch $@
+clean::
+	for file in $(upstreamtmpfiles_); do \
+		[ ! -e $$file.upstream ] || mv -f $$file.upstream $$file; \
+	done
+	rm -f debian/stamp-upstreamtmpstuff
+
+common-build-indep:: debian/docs.stamp
+debian/docs.stamp:
+	$(MAKE) -C data/doc
+	touch $@
+clean::
+	rm -f debian/docs.stamp
+
 imgstub = data/img/gray/h2-icon
 common-build-arch::
 	#inkscape -z -e$(imgstub).png -D -w32 -h32 --export-area-snap $(imgstub).svg

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list