[SCM] csound/master: No more moving files aside

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0ec9ad516b8669888a2be3aed1912b7450ad4b61
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sun Oct 20 17:08:17 2013 -0300

    No more moving files aside

diff --git a/debian/rules b/debian/rules
index 7982fe8..be303d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -152,8 +152,6 @@ DEB_BUILD_PARALLEL = 1
 
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 
-upstreamtmpfiles = doc/latex/doxygen.sty
-
 DEB_SCONS_INSTALL_OPTIONS = instdir=$(CURDIR)/debian/tmp
 DEB_SCONS_INSTALL_TARGET = install=1
 
@@ -165,31 +163,12 @@ build-doxygen-stamp:
 	touch $@
 
 # Put aside upstream cruft before build but after licensecheck
-pre-build:: debian/stamp-upstreamtmpstuff Custom.cmake
-debian/stamp-upstreamtmpstuff:
-	for file in $(upstreamtmpfiles); do \
-		[ ! -e $$file ] || [ -e $$file.upstream ] || mv -v $$file $$file.upstream; \
-	done
-	for dir in $(upstreamtmpdirs); do \
-		[ ! -e $$dir ] || [ -e $$dir.upstream ] || mv -v $$dir $$dir.upstream; \
-	done
-	touch $@
-
+pre-build:: Custom.cmake
 Custom.cmake: debian/Custom.cmake
 	sed -e 's, at PYLIBPATH@,$(PYLIBPATH2),' -e 's, at MTUNE@,$(MTUNE),' \
 		debian/Custom.cmake > \
 		Custom.cmake
 
-# Revert upstream cruft that was put aside during build
-clean::
-	for file in $(upstreamtmpfiles); do \
-		[ ! -e $$file.upstream ] || mv -v -f $$file.upstream $$file; \
-	done
-	for dir in $(upstreamtmpdirs); do \
-		[ ! -e $$dir.upstream ] || mv -v -f $$dir.upstream $$dir; \
-	done
-	rm -f debian/stamp-upstreamtmpstuff
-
 clean::
 	rm -f build-arch-stamp build-indep-stamp manpages-stamp \
 		build-doxygen-stamp

-- 
csound packaging