From be06549353d021ab8830f1daa5ec2787e1ab469f Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Wed, 8 Nov 2017 21:28:41 +0100 Subject: [PATCH] Dropped unneeded patch magic - upstream accepted our patch - upstream remove directories with spaces (at least those that are interesting for us) --- debian/rules | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/debian/rules b/debian/rules index 5074cd9c..b522d351 100755 --- a/debian/rules +++ b/debian/rules @@ -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 -- 2.30.2