[SCM] calf/master: Simplify moving aside upstream cruft. Tighten build-dependency on cdbs.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 82d88a27467124826a781178c768fa70c1e76122
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue May 7 11:41:41 2013 +0200

    Simplify moving aside upstream cruft. Tighten build-dependency on cdbs.

diff --git a/debian/rules b/debian/rules
index 08b046e..5e82848 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,23 +28,11 @@ DEB_UPSTREAM_URL = http://downloads.sourceforge.net/calf
 LDFLAGS += -Wl,--as-needed
 
 # put aside upstream-shipped temp files during build but after copyright-check
-upstreamtmpfiles = calf.desktop
-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 $@
+DEB_UPSTREAM_CRUFT_MOVE = calf.desktop
 
 install/calf-plugins::
 	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
 
-clean::
-	for file in $(upstreamtmpfiles); do \
-		[ ! -e $$file.upstream ] || mv -f $$file.upstream $$file; \
-	done
-	rm -f debian/stamp-upstreamtmpstuff
-
 # Needed by upstream build process
 CDBS_BUILD_DEPENDS += , libglib2.0-dev, libgtk2.0-dev, libreadline-dev, libexpat1-dev
 CDBS_BUILD_DEPENDS += , libasound2-dev [linux-any]

-- 
calf audio plugins packaging