[SCM] hydrogen/master: Build docs. (Closes: #629107)

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit cefbdf7cca7779a6fa38e5e3d37893e261d63ae5
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Nov 13 17:30:59 2016 +0100

    Build docs. (Closes: #629107)

diff --git a/debian/rules b/debian/rules
index 2bbf459..0dfcf35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,27 +38,13 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^.*\.(flac|png|qm)|debian/(changelog|copyrigh
 # according to upstream INSTALL.txt this avoids potential clash with Qt3
 export QTDIR=/usr/share/qt4
 
-# 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
+common-build-indep:: debian/docs.stamp
+debian/docs.stamp:
+	touch data/doc/manual.docbook data/doc/tutorial.docbook
+	$(MAKE) -C data/doc
 	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
+	rm -f debian/docs.stamp
 
 imgstub = data/img/gray/h2-icon
 common-build-arch::

-- 
hydrogen packaging