[SCM] liblrdf/master: Have cdbs handle putting aside upstream cruft during build.

js at users.alioth.debian.org js at users.alioth.debian.org
Wed Feb 17 11:46:49 UTC 2016


The following commit has been merged in the master branch:
commit 064f0bf354d9b89de86a6f7424d869852b4f122d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Feb 17 12:37:43 2016 +0100

    Have cdbs handle putting aside upstream cruft during build.

diff --git a/debian/rules b/debian/rules
index d522cc3..cbc0ba5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,33 +40,23 @@ CDBS_BUILD_DEPENDS += , d-shlibs, ladspa-sdk
 CDBS_BUILD_DEPENDS += , libraptor1-dev (>= 1.4.21-3)
 
 # put aside upstream-shipped temp files during build but after copyright-check
-upstreamtmpfiles = INSTALL \
-		Makefile.in \
-		aclocal.m4 \
-		config.guess \
-		config.h.in \
-		config.sub \
-		configure \
-		depcomp \
-		examples/Makefile.in \
-		install-sh \
-		ltmain.sh \
-		missing \
-		mkinstalldirs \
-		src/Makefile.am \
-		src/Makefile.in \
-		src/lrdf_md5.h
-pre-build:: debian/stamp-upstreamtmpstuff
-debian/stamp-upstreamtmpstuff: debian/stamp-copyright-check
-	for file in $(upstreamtmpfiles); do \
-		[ ! -e $$file ] || [ -e $$file.upstream ] || cp $$file $$file.upstream; \
-	done
-	touch $@
-clean::
-	for file in $(upstreamtmpfiles); do \
-		[ ! -e $$file.upstream ] || mv -f $$file.upstream $$file; \
-	done
-	rm -f debian/stamp-upstreamtmpstuff
+DEB_UPSTREAM_CRUFT_MOVE = \
+ INSTALL \
+ Makefile.in \
+ aclocal.m4 \
+ config.guess \
+ config.h.in \
+ config.sub \
+ configure \
+ depcomp \
+ examples/Makefile.in \
+ install-sh \
+ ltmain.sh \
+ missing \
+ mkinstalldirs \
+ src/Makefile.am \
+ src/Makefile.in \
+ src/lrdf_md5.h
 
 clean::
 	rm -f stamp-h

-- 
liblrdf packaging



More information about the pkg-multimedia-commits mailing list