From 4d45d40c782c3c536d917c51c0054e9ee01a676a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 14 Mar 2015 19:21:25 +0100 Subject: debian: Move to multi-arch support in libosmocore Enable multi-arch support in libosmocore. This means the package can not be built on squeeze anymore. The concept of "foreign" is not really well documented but I think I use it correctly here. --- debian/compat | 2 +- debian/control | 13 ++++++++++++- debian/libosmocodec0.install | 2 +- debian/libosmocore-dev.install | 8 ++++---- debian/libosmocore6.install | 2 +- debian/libosmoctrl0.install | 2 +- debian/libosmogb3.install | 2 +- debian/libosmogsm5.install | 2 +- debian/libosmosim0.install | 2 +- debian/libosmovty1.install | 2 +- 10 files changed, 24 insertions(+), 13 deletions(-) diff --git a/debian/compat b/debian/compat index 45a4fb75..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index ed525b59..a9f9b151 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libosmocore Section: libs Priority: optional Maintainer: Harald Welte -Build-Depends: debhelper (>= 8.0.0), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libpcsclite-dev, pkg-config +Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libpcsclite-dev, pkg-config Standards-Version: 3.9.3 Homepage: http://bb.osmocom.org/trac/wiki/libosmocore Vcs-Git: git://git.osmocom.org/libosmocore.git @@ -12,59 +12,69 @@ Package: libosmocore Section: libs Architecture: any Depends: libosmocodec0, libosmocore6, libosmogb3, libosmogsm5, libosmovty1, ${misc:Depends} +Multi-Arch: foreign Description: Open Source MObile COMmunications CORE library Package: libosmocodec0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: Osmo codec library Package: libosmocore6 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: Osmo Core library Package: libosmogb3 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: Osmo GPRS GB library Package: libosmogsm5 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: Osmo GSM utility library Package: libosmovty1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: Osmo VTY library Package: libosmoctrl0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: Osmo control library Package: libosmosim0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: Osmo SIM library Package: libosmocore-dev Section: libdevel Architecture: any Depends: ${misc:Depends}, libosmocore +Multi-Arch: same Description: Development headers for Open Source MObile COMmunications CORE library Package: libosmocore-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore +Multi-Arch: same Description: Utilities for gsm Package: libosmocore-dbg @@ -72,4 +82,5 @@ Architecture: any Section: debug Priority: extra Depends: libosmocore (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same Description: Debug symbols for Open Source MObile COMmunications CORE library diff --git a/debian/libosmocodec0.install b/debian/libosmocodec0.install index 2743b53b..2676133e 100644 --- a/debian/libosmocodec0.install +++ b/debian/libosmocodec0.install @@ -1 +1 @@ -usr/lib/libosmocodec*.so.* +usr/lib/*/libosmocodec*.so.* diff --git a/debian/libosmocore-dev.install b/debian/libosmocore-dev.install index ece5b085..7c5a789a 100644 --- a/debian/libosmocore-dev.install +++ b/debian/libosmocore-dev.install @@ -1,6 +1,6 @@ usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/lib*.la -usr/lib/pkgconfig/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/lib*.la +usr/lib/*/pkgconfig/* usr/share/doc/libosmocore/* diff --git a/debian/libosmocore6.install b/debian/libosmocore6.install index d1349023..b73331b9 100644 --- a/debian/libosmocore6.install +++ b/debian/libosmocore6.install @@ -1 +1 @@ -usr/lib/libosmocore*.so.* +usr/lib/*/libosmocore*.so.* diff --git a/debian/libosmoctrl0.install b/debian/libosmoctrl0.install index 6b23be88..56c64fc0 100644 --- a/debian/libosmoctrl0.install +++ b/debian/libosmoctrl0.install @@ -1 +1 @@ -usr/lib/libosmoctrl*.so.* +usr/lib/*/libosmoctrl*.so.* diff --git a/debian/libosmogb3.install b/debian/libosmogb3.install index 73ad3d3e..4c474255 100644 --- a/debian/libosmogb3.install +++ b/debian/libosmogb3.install @@ -1 +1 @@ -usr/lib/libosmogb*.so.* +usr/lib/*/libosmogb*.so.* diff --git a/debian/libosmogsm5.install b/debian/libosmogsm5.install index 12c9180a..5e617298 100644 --- a/debian/libosmogsm5.install +++ b/debian/libosmogsm5.install @@ -1 +1 @@ -usr/lib/libosmogsm*.so.* +usr/lib/*/libosmogsm*.so.* diff --git a/debian/libosmosim0.install b/debian/libosmosim0.install index 8f29c4d1..0a780abc 100644 --- a/debian/libosmosim0.install +++ b/debian/libosmosim0.install @@ -1 +1 @@ -usr/lib/libosmosim*.so.* +usr/lib/*/libosmosim*.so.* diff --git a/debian/libosmovty1.install b/debian/libosmovty1.install index 1b993e87..fbf6a5fa 100644 --- a/debian/libosmovty1.install +++ b/debian/libosmovty1.install @@ -1 +1 @@ -usr/lib/libosmovty*.so.* +usr/lib/*/libosmovty*.so.* -- cgit v1.2.3