[SCM] faust/master: Factored out binary package "faust-common"

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4a15bec6f17cd3200d9d07f4eecccc4771e6b9d3
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Sep 27 00:00:43 2016 +0200

    Factored out binary package "faust-common"

diff --git a/debian/control b/debian/control
index 472571c..4c5f639 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,8 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/faust.git
 Package: faust
 Architecture: any
 Depends:
- ${misc:Depends}, ${shlibs:Depends}
+ ${misc:Depends}, ${shlibs:Depends},
+ faust-common (>= ${source:Version}), faust-common (<< ${source:Upstream-Version}+1~),
 Recommends: python, ruby, libc6-dev | libc-dev, g++, make, libjack-dev, libgtk2.0-dev
 Suggests: kate
 Description: functional programming language for realtime audio applications
@@ -30,3 +31,21 @@ Description: functional programming language for realtime audio applications
  The generated code can be wrapped into an 'architecture file' in order to
  create for example a standalone jack/gtk application. Several architecture
  file are provided and additional ones are fairly easy to add.
+
+Package: faust-common
+Architecture: all
+Breaks: faust (<< 0.9.90~repack1-1),
+Replaces: faust (<< 0.9.90~repack1-1),
+Depends:
+ ${misc:Depends},
+Description: functional programming language for realtime audio applications - common files
+ Faust is a functional programming language specifically designed for realtime
+ audio applications and plugins. The syntax of the language is block diagram
+ oriented. The faust compiler translate signal processing specifications into
+ optimized C++ code for signal processing applications.
+ .
+ The generated code can be wrapped into an 'architecture file' in order to
+ create for example a standalone jack/gtk application. Several architecture
+ file are provided and additional ones are fairly easy to add.
+ .
+ This package contains the architecture independent files for faust.
diff --git a/debian/faust.docs b/debian/faust-common.docs
similarity index 57%
copy from debian/faust.docs
copy to debian/faust-common.docs
index 000c5f6..5dbad3e 100644
--- a/debian/faust.docs
+++ b/debian/faust-common.docs
@@ -1,2 +1,3 @@
 README
 documentation/*.pdf
+documentation/misc/
diff --git a/debian/faust-common.install b/debian/faust-common.install
new file mode 100644
index 0000000..decb741
--- /dev/null
+++ b/debian/faust-common.install
@@ -0,0 +1,4 @@
+/usr/include
+/usr/share/faust/utils
+/usr/lib/faust/*	usr/share/faust/code
+syntax-highlighting/faust.xml usr/share/kde4/apps/katepart/syntax/
diff --git a/debian/faust.links b/debian/faust-common.links
similarity index 100%
rename from debian/faust.links
rename to debian/faust-common.links
diff --git a/debian/faust.docs b/debian/faust.docs
index 000c5f6..e845566 100644
--- a/debian/faust.docs
+++ b/debian/faust.docs
@@ -1,2 +1 @@
 README
-documentation/*.pdf
diff --git a/debian/faust.examples b/debian/faust.examples
index 82fa625..e39721e 100644
--- a/debian/faust.examples
+++ b/debian/faust.examples
@@ -1,4 +1 @@
-examples/README.md
-examples/*.lib
-examples/*.dsp
-examples/Makefile*
+examples/*
diff --git a/debian/faust.install b/debian/faust.install
index 3fffa01..415f082 100644
--- a/debian/faust.install
+++ b/debian/faust.install
@@ -1 +1 @@
-syntax-highlighting/faust.xml usr/share/kde4/apps/katepart/syntax/
+/usr/bin
diff --git a/debian/rules b/debian/rules
index 4a1d81f..0bae6f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile-vars.mk
-include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/makefile.mk
+#include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_MAKE_ENVVARS = CFLAGS="$(or $(CFLAGS_$(cdbs_curpkg)),$(CFLAGS))" CXXFLAGS="$(or $(CXXFLAGS_$(cdbs_curpkg)),$(CXXFLAGS))" CPPFLAGS="$(or $(CPPFLAGS_$(cdbs_curpkg)),$(CPPFLAGS))" LDFLAGS="$(or $(LDFLAGS_$(cdbs_curpkg)),$(LDFLAGS))"
+DEB_MAKE_EXTRA_ARGS = $(DEB_MAKE_PARALLEL) PREFIX=/usr
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_make_curdestdir)
+
 
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \
         ^(.*\.(png|pdf|doctree|jar|xcuserstate|swc|ots)|debian/(changelog|copyright(|_hints|_newhints)))$
@@ -26,31 +31,31 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \
 DEB_COMPRESS_EXCLUDE_ALL=.dsp .lib Makefile
 MANPAGEDIR=debian/man
 
-build/faust::
-	CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) PREFIX=/usr
+.PHONY: manpages manpageclean
+manpages:
 	mkdir -p $(MANPAGEDIR)
 	help2man -N -n "functional programming language for realtime audio applications" \
 		debian/faust-help2man > $(MANPAGEDIR)/faust.1
 	help2man -N -n "Compile faust DSP code into SuperCollider module" \
 		tools/faust2sc-1.0.0/faust2sc > $(MANPAGEDIR)/faust2sc.1
 	debian/faust2man $(MANPAGEDIR) debian/faust2api.1
+manpageclean:
+	-rm -rf $(MANPAGEDIR)
 
-install/faust::
-	CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) DESTDIR=$(DEB_DESTDIR) PREFIX=/usr install
-	mkdir -p $(DEB_DESTDIR)/usr/share/faust
-	mv $(DEB_DESTDIR)/usr/lib/faust $(DEB_DESTDIR)/usr/share/faust/code
-	-find $(DEB_DESTDIR)/usr/share/faust/code "(" -name "*.a" -or -name "*.o" ")" -delete
+.PHONY: fixinstall
+fixinstall:
+	mkdir -p $(DEB_DESTDIR)/usr/share/faust/utils
+	-mv $(DEB_DESTDIR)/usr/bin/faustoptflags $(DEB_DESTDIR)/usr/share/faust/utils
+	-mv $(DEB_DESTDIR)/usr/bin/faustpath $(DEB_DESTDIR)/usr/share/faust/utils
 #	 remove source faustpath and faustoptflags from libexecdir
-	-rm $(DEB_DESTDIR)/usr/bin/faustoptflags
-	-rm $(DEB_DESTDIR)/usr/bin/faustpath
 	sed -e 's|^\( *\. \)faust|\1/usr/share/faust/utils/faust|' -i $(DEB_DESTDIR)/usr/bin/faust2*
+#	remove binary artifacts from to-be /usr/share
+	#-find $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/faust/code "(" -name "*.a" -or -name "*.o" ")" -delete
+	rm -rf $(DEB_DESTDIR)/usr/lib/faust/iOS/osclib/
 
-clean::
-	$(MAKE) clean
-	-rm -rf $(MANPAGEDIR)
 
-#override_dh_auto_install:
-#	$(MAKE) prefix=`pwd`/debian/faust/usr install
+common-binary-arch:: manpages
+clean:: manpageclean
+binary-install/faust:: fixinstall
+install/faust-common:: fixinstall
 
-#override_dh_compress:
-#	dh_compress -X.lib -X.dsp -XMakefile

-- 
faust packaging