[SCM] juce/master: Build debian-specific artifacts

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b8c471659d293404de9b378dc54f43972d38ff6e
Author: IOhannes m zmölnig <zmoelnig at umlautS.umlaeute.mur.at>
Date:   Wed Nov 8 21:50:01 2017 +0100

    Build debian-specific artifacts

diff --git a/debian/juce-tools.install b/debian/juce-tools.install
index c7867d1..27b6872 100644
--- a/debian/juce-tools.install
+++ b/debian/juce-tools.install
@@ -1,3 +1,3 @@
 extras/Projucer/Builds/LinuxMakefile/build/Projucer	usr/bin
-debian/libbuilder/build/juce.png		usr/share/pixmaps/
-debian/Projucer.desktop 			usr/share/applications/
+debian/artifacts/juce.png				usr/share/pixmaps/
+debian/Projucer.desktop 				usr/share/applications/
diff --git a/debian/juce-tools.manpages b/debian/juce-tools.manpages
new file mode 100644
index 0000000..08dbe24
--- /dev/null
+++ b/debian/juce-tools.manpages
@@ -0,0 +1 @@
+debian/artifacts/Projucer.1
diff --git a/debian/rules b/debian/rules
index 10c2f8a..165a809 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,6 @@
 ## but disables "-march=native" optimization
 export TARGET_ARCH=-g
 
-DEB_SRCDIR=debian/libbuilder/
-BUILDDIR=$(DEB_SRCDIR)build
-
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
@@ -21,24 +18,27 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \
 
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_make_curdestdir) prefix=/usr libdir=/usr/lib/${DEB_HOST_MULTIARCH}/
 
-DEB_INSTALL_MANPAGES_juce-tools=$(BUILDDIR)/Projucer.1
+DEB_INSTALL_MANPAGES_juce-tools=debian/Projucer.1
 DEB_INSTALL_CHANGELOGS_ALL=ChangeList.txt
 
+DEBIAN_BUILD_ARTIFACTS=debian/artifacts
+
 pre-build::
+	mkdir -p $(DEBIAN_BUILD_ARTIFACTS)
 	cp $(CURDIR)/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-40.png \
-		$(BUILDDIR)/juce.png
+		$(DEBIAN_BUILD_ARTIFACTS)/juce.png
 
 common-binary-arch:: $(DEB_INSTALL_MANPAGES_juce-tools)
 
-$(BUILDDIR)/Projucer.1:
+$(DEBIAN_BUILD_ARTIFACTS)/Projucer.1:
 	help2man -N --version-string="Projucer $(DEB_UPSTREAM_VERSION)" -n "the JUCE project-management tool" debian/scripts/Projucer-help2man > $@
 
 build/libjuce-doc::
 	cd doxygen && doxygen Doxyfile
 
-build/libjuce-dev::
+build/juce-modules-source:
 	make -C debian/extra/lv2-ttl-generator/
-install/libjuce-dev::
+install/juce-modules-source:
 	install -d $(cdbs_curdestdir)/usr/lib/$(DEB_HOST_MULTIARCH)/juce/lv2-ttl-generator
 	install debian/extra/lv2-ttl-generator/lv2_ttl_generator $(cdbs_curdestdir)/usr/lib/$(DEB_HOST_MULTIARCH)/juce/lv2-ttl-generator/lv2_ttl_generator
 	install debian/extra/lv2-ttl-generator/generate-ttl.sh $(cdbs_curdestdir)/usr/lib/$(DEB_HOST_MULTIARCH)/juce/lv2-ttl-generator/generate-ttl.sh
@@ -53,3 +53,4 @@ clean::
 	rm -rf doxygen/doc
 	rm -rf extras/Projucer/Builds/LinuxMakefile/build
 	make -C debian/extra/lv2-ttl-generator/ clean
+	rm -rf $(DEBIAN_BUILD_ARTIFACTS)

-- 
juce packaging