[SCM] juce/master: idempotent patch/unpatch targets

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Thu Feb 11 13:06:48 UTC 2016


The following commit has been merged in the master branch:
commit a3eda74ae8edd47d0345976af4cd2a75772c277f
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Feb 11 13:30:00 2016 +0100

    idempotent patch/unpatch targets
    
    using a stamp-file

diff --git a/debian/rules b/debian/rules
index 1a220cd..39e2094 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,15 +43,19 @@ binary-post-install/juce-modules-source::
 clean:: unpatch
 	rm -rf doxygen/doc
 	rm -rf extras/Introjucer/Builds/Linux/build
-	rm -rf $(BUILDDATE_HEADER)
+	rm -f  $(BUILDDATE_HEADER)
 
 
 .PHONY: patch unpatch
 PATCHARGS=-f -p1 -r - --no-backup-if-mismatch
 PATCHPATTERN=^\#MANUAL\#
-patch::
+patch:: debian/stamp-manual-patch
+
+debian/stamp-manual-patch:
 	cat $(CURDIR)/debian/patches/series | sed -e '/$(PATCHPATTERN)/!d' -e 's|$(PATCHPATTERN)||' \
 		| while read p; do patch $(PATCHARGS) -i $(CURDIR)/debian/patches/$$p || true; done
+	touch $@
 unpatch::
-	cat $(CURDIR)/debian/patches/series | sed -e '/$(PATCHPATTERN)/!d' -e 's|$(PATCHPATTERN)||' \
+	-rm debian/stamp-manual-patch \
+	&& cat $(CURDIR)/debian/patches/series | sed -e '/$(PATCHPATTERN)/!d' -e 's|$(PATCHPATTERN)||' \
 		| while read p; do patch $(PATCHARGS) -i $(CURDIR)/debian/patches/$$p -R || true; done

-- 
juce packaging



More information about the pkg-multimedia-commits mailing list