[SCM] lives/multiarch: Almost ready to go multiarch

[alessio at users.alioth.debian.org]

The following commit has been merged in the multiarch branch:
commit 78ab5e78f46d2ca49a8c484b7bf0fb4bbf294d93
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Mar 12 14:59:19 2014 +0000

    Almost ready to go multiarch

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 7bcb77c..2d34c45 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  autoconf-archive,
  automake,
  bison,
- debhelper (>= 8.1~),
+ debhelper (>= 9~),
  dh-autoreconf,
  dpkg-dev (>= 1.16.1~),
  frei0r-plugins-dev [!kfreebsd-any !hurd-any !armhf !avr32 !sparc64],
@@ -51,6 +51,9 @@ Package: libweed-dbg
 Priority: extra
 Section: debug
 Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends}
 Depends:
  libweed0 (= ${binary:Version}),
  ${misc:Depends}
@@ -67,6 +70,9 @@ Section: libdevel
 Depends:
  libweed0 (= ${binary:Version}),
  ${misc:Depends}
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends}
 Description: Development library for inclusion of plugins into LiVES
  A library that was originally only available as part of LiVES (package
  lives) but is now available separately. Allows for the inclusion of
@@ -77,6 +83,9 @@ Description: Development library for inclusion of plugins into LiVES
 Package: libweed0
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -124,6 +133,9 @@ Description: Video Editing system allowing users to edit and create video
 
 Package: lives-data
 Architecture: all
+Multi-Arch: foreign
+Pre-Depends:
+ ${misc:Pre-Depends}
 Depends:
  ${misc:Depends}
 Description: Data files for LiVES
@@ -137,6 +149,9 @@ Package: lives-dbg
 Priority: extra
 Section: debug
 Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends}
 Depends:
  libweed-dbg,
  lives (= ${binary:Version}),
@@ -151,6 +166,9 @@ Description: Debugging symbols for LiVES
 
 Package: lives-plugins
 Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends}
 Depends:
  python3,
  ${perl:Depends},
diff --git a/debian/libweed-dev.install b/debian/libweed-dev.install
index e183cf9..146a603 100644
--- a/debian/libweed-dev.install
+++ b/debian/libweed-dev.install
@@ -1,2 +1,2 @@
 usr/include
-usr/lib/*.so
+usr/lib/*/*.so
diff --git a/debian/libweed0.install b/debian/libweed0.install
index 0e356bf..3fa1e44 100644
--- a/debian/libweed0.install
+++ b/debian/libweed0.install
@@ -1 +1 @@
-usr/lib/*.so.0*
+usr/lib/*/*.so.0*
diff --git a/debian/lives-plugins.install b/debian/lives-plugins.install
index a3e598c..994eb1b 100644
--- a/debian/lives-plugins.install
+++ b/debian/lives-plugins.install
@@ -1,4 +1,4 @@
 usr/bin/build-lives-rfx-plugin
 usr/bin/build-lives-rfx-plugin-multi
 usr/bin/lives_*_encoder3
-usr/lib/lives/plugins/
+usr/lib/*/lives/plugins/
diff --git a/debian/rules b/debian/rules
index 1231303..4b51773 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 export REPACK_SH=$(CURDIR)/debian/repack.sh
 
 UPSTREAM_VERSION=$(shell dpkg-parsechangelog | grep 'Version:' | sed 's/^Version:\s\(.*\)\(~ds[0-9]*\)-.*/\1/')
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
@@ -13,6 +14,9 @@ export CXXFLAGS+=$(CPPFLAGS)
 %:
 	dh $@ --parallel --with=autoreconf,python3
 
+override_dh_auto_configure:
+	dh_auto_configure -- --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+
 override_dh_auto_install:
 	dh_auto_install
 	find debian/tmp -type f -name "*.la" -ls -delete
@@ -23,11 +27,11 @@ override_dh_auto_install:
 			BUGS \
 			AUTHORS
 	rm -rf \
-	 debian/tmp/usr/lib/lives/plugins/effects/realtime/weed/data/.svn/ \
-	 debian/tmp/usr/lib/lives/plugins/effects/realtime/weed/icons/.svn/
-	find debian/tmp/usr/lib/lives -type d -empty -delete
+	 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lives/plugins/effects/realtime/weed/data/.svn/ \
+	 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lives/plugins/effects/realtime/weed/icons/.svn/
+	find debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lives -type d -empty -delete
 	chmod a-x \
-		debian/tmp/usr/lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/*.txt
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lives/plugins/effects/realtime/weed/data/fourKlives/songs/*.txt
 
 override_dh_strip:
 	dh_strip -plibweed0 --dbg-package=libweed-dbg

-- 
lives packaging