[SCM] juce/master: run 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 5f26f8353d4e24c2a130b3a2feb80ea2934bde1b
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Feb 11 13:19:10 2016 +0100

    run patch/unpatch targets

diff --git a/debian/rules b/debian/rules
index 7329420..1a220cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_make_curdestdir) prefix=/usr li
 DEB_INSTALL_MANPAGES_juce-utils=$(BUILDDIR)/Introjucer.1
 DEB_INSTALL_CHANGELOGS_ALL=ChangeList.txt
 
-pre-build::
+pre-build:: patch
 	mkdir -p $(dir $(BUILDDATE_HEADER))
 	test -e $(BUILDDATE_HEADER) || (echo "#define BUILD_DATE \"$(BUILD_DATE)\"" > $(BUILDDATE_HEADER))
 
@@ -40,7 +40,7 @@ binary-post-install/juce-modules-source::
 	find $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/juce -type f -name "*.h" -or -name "*.cpp" \
 		-exec chmod 0644 {} +
 
-clean::
+clean:: unpatch
 	rm -rf doxygen/doc
 	rm -rf extras/Introjucer/Builds/Linux/build
 	rm -rf $(BUILDDATE_HEADER)
@@ -51,7 +51,7 @@ PATCHARGS=-f -p1 -r - --no-backup-if-mismatch
 PATCHPATTERN=^\#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; done
+		| while read p; do patch $(PATCHARGS) -i $(CURDIR)/debian/patches/$$p || true; done
 unpatch::
 	cat $(CURDIR)/debian/patches/series | sed -e '/$(PATCHPATTERN)/!d' -e 's|$(PATCHPATTERN)||' \
-		| while read p; do patch $(PATCHARGS) -i $(CURDIR)/debian/patches/$$p -R; done
+		| 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