[SCM] libshout/master: Simplify rules file, using CDBS DEB_UPSTREAM_CRUFT_MOVE. Tighten build-dependency on cdbs.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1b7dfca9530080bb2fb3735296f947d88f943ef7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu May 9 19:25:53 2013 +0200

    Simplify rules file, using CDBS DEB_UPSTREAM_CRUFT_MOVE. Tighten build-dependency on cdbs.

diff --git a/debian/rules b/debian/rules
index 3c6f35d..5be3379 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,35 +76,10 @@ clean::
 	rm -f debian/stamp-local-shlibs-$(lib)
 
 # put aside autogenerated files during build
-# TODO: use DEB_UPSTREAM_CRUFT_MOVE when cdbs 0.4.106 is in stable
-upstreamtmpstuff = Makefile.in $(patsubst %,%/Makefile.in,doc examples include include/shout src win32)
-upstreamtmpstuff += $(patsubst %,src/%/Makefile.in,avl httpp net thread timing)
-upstreamtmpstuff += configure aclocal.m4 depcomp install-sh missing
-upstreamtmpstuff += ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
-pre-build:: debian/upstream-stuff
-debian/upstream-stuff: debian/stamp-copyright-check
-	mkdir -p debian/upstream-stuff
-	@for orig in $(upstreamtmpstuff); do \
-		backup="debian/upstream-stuff/$$orig"; \
-		[ ! -e "$$orig" ] || [ -e "$$backup" ] || { \
-			mkdir -p "$$(dirname "$$backup")"; \
-			echo mv "$$orig" "$$backup"; \
-			mv "$$orig" "$$backup"; \
-		}; \
-	done
-clean::
-	@for orig in $(upstreamtmpstuff); do \
-		backup="debian/upstream-stuff/$$orig"; \
-		if [ -e "$$backup" ]; then \
-			if [ -e "$$orig" ]; then \
-				echo "rm -rf" "$$orig"; \
-				rm -rf "$$orig"; \
-			fi; \
-			echo mv "$$backup" "$$orig"; \
-			mv "$$backup" "$$orig"; \
-		fi; \
-	done
-	rm -rf debian/upstream-stuff
+DEB_UPSTREAM_CRUFT_MOVE = Makefile.in $(patsubst %,%/Makefile.in,doc examples include include/shout src win32)
+DEB_UPSTREAM_CRUFT_MOVE += $(patsubst %,src/%/Makefile.in,avl httpp net thread timing)
+DEB_UPSTREAM_CRUFT_MOVE += configure aclocal.m4 depcomp install-sh missing
+DEB_UPSTREAM_CRUFT_MOVE += ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
 
 # (re)generate most possible autotools files
 DEB_ACLOCAL_ARGS = -Im4 --install --force

-- 
libshout packaging