[SCM] lash packaging branch, master, updated. upstream/0.5.4-8-g79b3229

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 79b32293b9094a698beef91a52fe5e1cc3159942
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Apr 18 12:44:38 2010 +0200

    Preserve upstream-shipped html file during build, and drop old cleanup cruft.

diff --git a/debian/rules b/debian/rules
index 4d8d928..f61e73c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,19 @@ DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/0\.5\.4\.0/0.5.4/
 # Avoid PNG files upsetting dpkg-source
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^\./(icons/.*\.png|debian/(changelog|copyright(|_hints|_newhints)))$
 
+# put aside upstream-shipped temp files during build but after copyright-check
+upstreamtmpfiles = docs/lash-manual-html-one-page/lash-manual.html
+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::
-	-rm -rf build-tree/lash-*/docs/lash-manual-html-split/lash-manual
+	for file in $(upstreamtmpfiles); do \
+		[ ! -e $$file.upstream ] || mv -f $$file.upstream $$file; \
+	done
+	rm -f debian/stamp-upstreamtmpstuff
 
 binary-install/python-lash::
 	dh_pysupport -p$(cdbs_curpkg)

-- 
lash packaging