From 620133b447973aff2b920c4496e43e7f516cf891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?"Miguel=20A.=20Col=C3=B3n=20V=C3=A9lez"?= Date: Thu, 26 Apr 2012 03:17:59 -0400 Subject: [PATCH 1/2] Convert to Multi-Arch. --- debian/compat | 2 +- debian/control | 8 +++++--- debian/liborc-0.4-0.install | 2 +- debian/liborc-0.4-dev.install | 6 +++--- debian/rules | 3 +-- 5 files changed, 11 insertions(+), 10 deletions(-) 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 75d351c..287aa2f 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,8 @@ Section: devel Priority: optional Maintainer: Maintainers of GStreamer packages Uploaders: Sebastian Dröge , Sjoerd Simons -Build-Depends: cdbs, - debhelper (>= 7), - dpkg-dev (>= 1.14.13), +Build-Depends: cdbs (>= 0.4.93~), + debhelper (>= 9), autotools-dev, gtk-doc-tools Standards-Version: 3.9.0 @@ -14,6 +13,8 @@ Homepage: http://code.entropywave.com/projects/orc/ Package: liborc-0.4-0 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Library of Optimized Inner Loops Runtime Compiler @@ -48,6 +49,7 @@ Package: liborc-0.4-0-dbg Section: debug Architecture: any Priority: extra +Multi-Arch: same Depends: liborc-0.4-0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/liborc-0.4-0.install b/debian/liborc-0.4-0.install index ce1c795..1042058 100644 --- a/debian/liborc-0.4-0.install +++ b/debian/liborc-0.4-0.install @@ -1 +1 @@ -debian/tmp/usr/lib/liborc*-0.4.so.* +debian/tmp/usr/lib/*/liborc*-0.4.so.* diff --git a/debian/liborc-0.4-dev.install b/debian/liborc-0.4-dev.install index 10e1260..9fc117e 100644 --- a/debian/liborc-0.4-dev.install +++ b/debian/liborc-0.4-dev.install @@ -1,6 +1,6 @@ -debian/tmp/usr/lib/liborc*-0.4.so -debian/tmp/usr/lib/liborc*-0.4.a +debian/tmp/usr/lib/*/liborc*-0.4.so +debian/tmp/usr/lib/*/liborc*-0.4.a debian/tmp/usr/include/orc-0.4 -debian/tmp/usr/lib/pkgconfig/orc-0.4.pc +debian/tmp/usr/lib/*/pkgconfig/orc-0.4.pc debian/tmp/usr/bin/orcc debian/tmp/usr/bin/orc-bugreport diff --git a/debian/rules b/debian/rules index 8c01ad6..4d39965 100755 --- a/debian/rules +++ b/debian/rules @@ -5,8 +5,7 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/autotools.mk DEB_DH_STRIP_ARGS := --dbg-package=liborc-0.4-0-dbg -DEB_CONFIGURE_EXTRA_FLAGS := --enable-static - +DEB_CONFIGURE_EXTRA_FLAGS := --enable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) APIVER := 0.4 SHLIBVER := 1:0.4.16 liborc := $(shell sed -nr 's/^Package:[[:space:]]*(liborc-$(APIVER)-[0-9]+)[[:space:]]*$$/\1/p' debian/control) -- 1.7.10