Dropped unneeded patch magic
authorIOhannes m zmölnig <zmoelnig@umlautS.umlaeute.mur.at>
Wed, 8 Nov 2017 20:28:41 +0000 (21:28 +0100)
committerIOhannes m zmölnig <zmoelnig@umlautS.umlaeute.mur.at>
Wed, 8 Nov 2017 20:28:41 +0000 (21:28 +0100)
- upstream accepted our patch
- upstream remove directories with spaces (at least those that are interesting for us)

debian/rules

index 5074cd9c63dcd84fbeb1ea21c9369469b209725d..b522d351f9f2ccaf83c9125df32ad12d1ff8b681 100755 (executable)
@@ -26,7 +26,7 @@ DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_make_curdestdir) prefix=/usr li
 DEB_INSTALL_MANPAGES_juce-tools=$(BUILDDIR)/Projucer.1
 DEB_INSTALL_CHANGELOGS_ALL=ChangeList.txt
 
-pre-build:: patch
+pre-build::
        mkdir -p $(dir $(BUILDDATE_HEADER))
        test -e $(BUILDDATE_HEADER) || ( \
                echo "/* Override build-time for reproducible builds */ " > $(BUILDDATE_HEADER); \
@@ -57,23 +57,9 @@ binary-post-install/juce-modules-source::
                '(' -name "*.h" -or -name "*.cpp" ')' \
                -exec chmod -c 0644 {} +
 
-clean:: unpatch
+clean::
        rm -rf doxygen/doc
        rm -rf extras/Projucer/Builds/LinuxMakefile/build
        rm -f  $(BUILDDATE_HEADER)
        make -C debian/extra/lv2-ttl-generator/ clean
 
-
-.PHONY: patch unpatch
-PATCHARGS=-f -p1 -r - --no-backup-if-mismatch
-PATCHPATTERN=^\#MANUAL\#
-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::
-       -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