[SCM] juce/master: Dropped unneeded patch magic
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Thu Nov 9 13:06:37 UTC 2017
The following commit has been merged in the master branch:
commit be06549353d021ab8830f1daa5ec2787e1ab469f
Author: IOhannes m zmölnig <zmoelnig at umlautS.umlaeute.mur.at>
Date: Wed Nov 8 21:28:41 2017 +0100
Dropped unneeded patch magic
- upstream accepted our patch
- upstream remove directories with spaces (at least those that are interesting for us)
diff --git a/debian/rules b/debian/rules
index 5074cd9..b522d35 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
--
juce packaging
More information about the pkg-multimedia-commits
mailing list