From 47932411902d1d9e4b98e56613b825287fce37fe Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Sun, 25 Mar 2012 20:34:00 +0100 Subject: Add Multiarch support --- debian/changelog | 3 ++- debian/compat | 2 +- debian/control | 10 +++++++++- debian/libconfig++-dev.install | 6 +++--- debian/libconfig++9.install | 2 +- debian/libconfig-dev.install | 6 +++--- debian/libconfig9.install | 2 +- debian/rules | 2 ++ 8 files changed, 22 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1784a28..48ae30e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ libconfig (1.4.8-4) unstable; urgency=low * Add C++ hardened buildflags - Thanks to Simon Ruderich for the patch (closes: #662225) * Improve libconfig(++)8-dev transition package descriptions + * Add Multiarch support - -- Jonathan McCrohan Sun, 25 Mar 2012 20:25:02 +0100 + -- Jonathan McCrohan Sun, 25 Mar 2012 20:33:40 +0100 libconfig (1.4.8-3) unstable; urgency=low 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 0dd3d9e..cb3d0ac 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,16 @@ Source: libconfig Priority: optional Maintainer: Jose Luis Tallon Uploaders: Jonathan McCrohan -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, texinfo, texlive-latex-base +Build-Depends: debhelper (>= 9), autotools-dev, texinfo, texlive-latex-base Standards-Version: 3.9.3 Homepage: http://www.hyperrealm.com/libconfig/ Section: libs Package: libconfig9 Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: parsing and manipulation of structured configuration files This library features a fully reentrant parser and includes bindings for both the C and C++ programming languages. It runs on modern POSIX-compliant @@ -21,7 +23,9 @@ Description: parsing and manipulation of structured configuration files Package: libconfig++9 Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: parsing and manipulation of structured configuration files(C++ binding) This library features a fully reentrant parser and includes bindings for both the C and C++ programming languages. It runs on modern POSIX-compliant @@ -39,6 +43,7 @@ Architecture: any Replaces: libconfig8-dev (<< 1.4.8) Breaks: libconfig8-dev (<< 1.4.8) Depends: libconfig9 (= ${binary:Version}), pkg-config (>= 0.20), ${misc:Depends} +Multi-Arch: same Description: parsing and manipulation of structured config files(development) This library features a fully reentrant parser and includes bindings for both the C and C++ programming languages. It runs on modern POSIX-compliant @@ -72,6 +77,7 @@ Replaces: libconfig++8-dev (<< 1.4.8) Breaks: libconfig++8-dev (<< 1.4.8) Depends: libconfig++9 (= ${binary:Version}), libconfig-dev, pkg-config (>= 0.20), ${misc:Depends} +Multi-Arch: same Description: parsing and manipulation of structured config files(C++ development) This library features a fully reentrant parser and includes bindings for both the C and C++ programming languages. It runs on modern POSIX-compliant @@ -104,6 +110,7 @@ Section: debug Priority: extra Architecture: any Depends: libconfig9 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same Description: parsing and manipulation of structured config files(debug symbols) This library features a fully reentrant parser and includes bindings for both the C and C++ programming languages. It runs on modern POSIX-compliant @@ -120,6 +127,7 @@ Section: debug Priority: extra Architecture: any Depends: libconfig++9 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same Description: parsing and manipulation of structured config files(C++ debug symbols) This library features a fully reentrant parser and includes bindings for both the C and C++ programming languages. It runs on modern POSIX-compliant diff --git a/debian/libconfig++-dev.install b/debian/libconfig++-dev.install index 0cf05e1..75c2d47 100644 --- a/debian/libconfig++-dev.install +++ b/debian/libconfig++-dev.install @@ -1,4 +1,4 @@ debian/tmp/usr/include/libconfig.h++ -debian/tmp/usr/lib/libconfig++.a -debian/tmp/usr/lib/libconfig++.so -debian/tmp/usr/lib/pkgconfig/libconfig++.pc +debian/tmp/usr/lib/*/libconfig++.a +debian/tmp/usr/lib/*/libconfig++.so +debian/tmp/usr/lib/*/pkgconfig/libconfig++.pc diff --git a/debian/libconfig++9.install b/debian/libconfig++9.install index 35c586e..f63c7e9 100644 --- a/debian/libconfig++9.install +++ b/debian/libconfig++9.install @@ -1 +1 @@ -debian/tmp/usr/lib/libconfig++.so.9* +debian/tmp/usr/lib/*/libconfig++.so.9* diff --git a/debian/libconfig-dev.install b/debian/libconfig-dev.install index b87a91b..375054d 100644 --- a/debian/libconfig-dev.install +++ b/debian/libconfig-dev.install @@ -1,4 +1,4 @@ debian/tmp/usr/include/libconfig.h -debian/tmp/usr/lib/libconfig.a -debian/tmp/usr/lib/libconfig.so -debian/tmp/usr/lib/pkgconfig/libconfig.pc +debian/tmp/usr/lib/*/libconfig.a +debian/tmp/usr/lib/*/libconfig.so +debian/tmp/usr/lib/*/pkgconfig/libconfig.pc diff --git a/debian/libconfig9.install b/debian/libconfig9.install index b73360c..9064128 100644 --- a/debian/libconfig9.install +++ b/debian/libconfig9.install @@ -1 +1 @@ -debian/tmp/usr/lib/libconfig.so.9* +debian/tmp/usr/lib/*/libconfig.so.9* diff --git a/debian/rules b/debian/rules index 7a7b9da..4de4b58 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,7 @@ # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS = $(shell dpkg-buildflags --get CFLAGS) CFLAGS += -Wall -g @@ -28,6 +29,7 @@ config.status: configure ln -sf /usr/share/misc/config.guess config.guess ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info -- cgit v1.2.3