[SCM] taopm/master: Go multiarch.

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 45001c9b1febb0b193ee007d30c5f528f140d3af
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Fri Apr 19 10:02:05 2013 -0400

    Go multiarch.

diff --git a/debian/changelog b/debian/changelog
index 5085d65..01d3fc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 taopm (1.0-1) experimental; urgency=low
 
-  * Initial release. (Closes: #000000)
-
- -- Tiago Bortoletto Vaz <tiago at debian.org>  Thu, 14 Mar 2013 21:20:36 -0400
+  * Initial release. (Closes: #703111)
 
+ -- Tiago Bortoletto Vaz <tiago at debian.org>  Thu, 18 Apr 2013 19:36:57 -0400
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index fe6238f..492263e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Tiago Bortoletto Vaz <tiago at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>=7.0.50~)
+Build-Depends: debhelper (>=9), dh-exec (>=0.3)
 Standards-Version: 3.9.3
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/taopm.git
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/taopm.git
@@ -12,6 +12,7 @@ Homepage: http://taopm.sourceforge.net
 
 Package: taopm
 Architecture: any
+Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends}, ${misc:Depends}, libglut3-dev
 Description: Sound synthesis software with physical models
  Tao is a software package for sound synthesis using physical models. It
diff --git a/debian/patches/01-add-missing-headers.diff b/debian/patches/01-add-missing-headers.diff
index 193dcf2..5b1f9eb 100644
--- a/debian/patches/01-add-missing-headers.diff
+++ b/debian/patches/01-add-missing-headers.diff
@@ -1,3 +1,6 @@
+Description: Adding missing headers
+Author: Tiago Bortoletto Vaz <tiago at debian.org>
+Last-Update: 2013-04-17
 --- a/libtao/Tao.cc
 +++ b/libtao/Tao.cc
 @@ -18,6 +18,7 @@
diff --git a/debian/patches/02-fix-parser-yyerror.diff b/debian/patches/02-fix-parser-yyerror.diff
index 0fdfa06..d77f034 100644
--- a/debian/patches/02-fix-parser-yyerror.diff
+++ b/debian/patches/02-fix-parser-yyerror.diff
@@ -1,3 +1,6 @@
+Description: Use a constant char, dummy comment.
+Author: Tiago Bortoletto Vaz <tiago at debian.org>
+Last-Update: 2013-04-17
 --- a/taoparse/taoparser.yy
 +++ b/taoparse/taoparser.yy
 @@ -23,7 +23,7 @@
diff --git a/debian/patches/03-fix-taodir-in-configure.diff b/debian/patches/03-fix-taodir-in-configure.diff
deleted file mode 100644
index f885daa..0000000
--- a/debian/patches/03-fix-taodir-in-configure.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -249,7 +249,7 @@
- # if backwards compatibility has been broken,
- # set TAO_BINARY_AGE and TAO_INTERFACE_AGE to 0.
- 
--TAODIR=`pwd`
-+TAODIR="/usr/lib"
- DATE=`date`
- TAO_MAJOR_VERSION=1
- TAO_MINOR_VERSION=0
diff --git a/debian/patches/series b/debian/patches/series
index 0860772..669d14f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 01-add-missing-headers.diff
 02-fix-parser-yyerror.diff
-03-fix-taodir-in-configure.diff
+03-fix-shell-standard-out.diff
diff --git a/debian/rules b/debian/rules
index 7caa60c..a9851b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,13 @@
 #!/usr/bin/make -f
 
+# TODO: multiarch - needs some hacks in upstream code
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure
+	dh_auto_configure -- TAODIR=/usr/lib/$(DEB_HOST_MULTIARCH)/taopm
 #	TODO: fix libtool old instructions
 #	autoreconf -i --force
 override_dh_auto_clean:
@@ -12,7 +15,12 @@ override_dh_auto_clean:
 	rm -f libtao/*.loT config.status.lineno
 override_dh_install:
 	dh_install --list-missing
-	# Drop content of dependency_libs
-	for file in $(CURDIR)/debian/taopm/usr/lib/*.la; do \
+	#Drop content of dependency_libs
+	for file in $(CURDIR)/debian/taopm/usr/lib/$(DEB_HOST_MULTIARCH)/*.la; do \
 	        sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
 	done
+override_dh_fixperms:
+	dh_fixperms
+	chmod 644 debian/taopm/usr/share/doc/taopm/examples/* \
+                  debian/taopm/usr/lib/$(DEB_HOST_MULTIARCH)/taopm/include/* \
+                  debian/taopm/usr/lib/$(DEB_HOST_MULTIARCH)/taopm/user-scripts/error.parse

-- 
taopm packaging