[SCM] morituri/master: Simplify rules file, using CDBS DEB_UPSTREAM_CRUFT_MOVE.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 32dbbe90a95796ce4bd7e26dd43c3515e1f7ceab
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon May 6 14:49:16 2013 +0200

    Simplify rules file, using CDBS DEB_UPSTREAM_CRUFT_MOVE.

diff --git a/debian/rules b/debian/rules
index d627776..3cdd1f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,44 +84,16 @@ automakedirs += $(addprefix morituri/,$(moriautomakedirs))
 automakepaths = $(addsuffix /Makefile.in,$(automakedirs))
 
 # put aside autogenerated files during build
-# TODO: use DEB_UPSTREAM_CRUFT_MOVE when cdbs 0.4.106 is in stable
-upstreamtmpstuff = $(automakepaths) $(aclocalpaths) $(autoconfpaths)
-pre-build:: debian/upstream-stuff
-#debian/upstream-stuff: debian/stamp-copyright-check
-debian/upstream-stuff:
-	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 = $(automakepaths) $(aclocalpaths) $(autoconfpaths)
 
 # (re)generate most possible autotools files
 # bootstrap autotools files (CDBS by default only update, not create)
 DEB_ACLOCAL_ARGS = -Im4 --install --force
 DEB_AUTOMAKE_ARGS = --add-missing --copy --foreign --force
 DEB_MAKE_CLEAN_TARGET = distclean
-#makefile-clean::
-#	rm -f $(upstreamtmpstuff)
 
 # Workaround for configure hints broken wrt. srcdir != builddir
-upstreamtmpstuff += morituri/configure/installed.py morituri/configure/uninstalled.py
+DEB_UPSTREAM_CRUFT_MOVE += morituri/configure/installed.py morituri/configure/uninstalled.py
 pre-build::
 	ln -f -s -t morituri/configure ../../build/morituri/configure/installed.py ../../build/morituri/configure/uninstalled.py
 

-- 
morituri packaging