From 9a935e27b59b5b51713d0030970c8c758e2ba385 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 12 Aug 2013 11:47:12 +0200 Subject: [PATCH] debian: Split libosmocore into various libs and address lintian warnings Package the various libraries separately. This will allow to install libosmogsm3 and libosmogsm4 in parallel. E: libosmocore-dev: non-empty-dependency_libs-in-la-file usr/lib/libosmocore.la E: libosmocore-dev: non-empty-dependency_libs-in-la-file usr/lib/libosmogb.la E: libosmocore-dev: non-empty-dependency_libs-in-la-file usr/lib/libosmogsm.la E: libosmocore-dev: non-empty-dependency_libs-in-la-file usr/lib/libosmovty.la W: libosmocore-dbg: wrong-bug-number-in-closes l54:#nnnn W: libosmocore: wrong-bug-number-in-closes l54:#nnnn W: libosmocore: package-name-doesnt-match-sonames libosmocodec0 libosmocore4 libosmogb2 libosmogsm4 libosmovty0 --- debian/changelog | 5 +++-- debian/compat | 2 +- debian/control | 38 ++++++++++++++++++++++++++++++---- debian/libosmocodec0.install | 1 + debian/libosmocore-dev.install | 1 + debian/libosmocore.install | 2 -- debian/libosmocore4.install | 1 + debian/libosmogb2.install | 1 + debian/libosmogsm4.install | 1 + debian/libosmovty0.install | 1 + debian/rules | 6 +++++- 11 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 debian/libosmocodec0.install create mode 100644 debian/libosmocore4.install create mode 100644 debian/libosmogb2.install create mode 100644 debian/libosmogsm4.install create mode 100644 debian/libosmovty0.install diff --git a/debian/changelog b/debian/changelog index e3c7e89d8..9e8ff1543 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -libosmocore (0.6.3) UNRELEASED; urgency=low +libosmocore (0.6.3+git1-1) UNRELEASED; urgency=low * New upstream release with new primitives, USSD fixes. + * Split libosmocore into several package. One lib per package. -- Holger Hans Peter Freyther Fri, 09 Aug 2013 17:47:30 +0200 @@ -51,6 +52,6 @@ libosmocore (0.1.27) natty; urgency=low libosmocore (0.1.17-1) unstable; urgency=low - * Initial release (Closes: #nnnn) + * Initial release -- Harald Welte Tue, 24 Aug 2010 10:55:04 +0200 diff --git a/debian/compat b/debian/compat index 7f8f011eb..45a4fb75d 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index 056356014..e0824a7d6 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: libosmocore Section: libs Priority: optional Maintainer: Harald Welte -Build-Depends: debhelper (>= 7.0.50), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 8.0.0), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen +Standards-Version: 3.9.3 Homepage: http://bb.osmocom.org/trac/wiki/libosmocore Vcs-Git: git://git.osmocom.org/libosmocore.git Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmocore.git;a=summary @@ -11,13 +11,43 @@ Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmocore.git;a=summary Package: libosmocore Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: libosmocodec0, libosmocore4, libosmogb2, libosmogsm4, libosmovty0, ${misc:Depends} Description: Open Source MObile COMmunications CORE library +Package: libosmocodec0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Osmo codec library + +Package: libosmocore4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Osmo Core library + +Package: libosmogb2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Osmo GPRS GB library + +Package: libosmogsm4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Osmo GSM utility library + +Package: libosmovty0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Osmo VTY library + Package: libosmocore-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore +Depends: ${misc:Depends}, libosmocore Description: Development headers for Open Source MObile COMmunications CORE library Package: libosmocore-utils diff --git a/debian/libosmocodec0.install b/debian/libosmocodec0.install new file mode 100644 index 000000000..2743b53b6 --- /dev/null +++ b/debian/libosmocodec0.install @@ -0,0 +1 @@ +usr/lib/libosmocodec*.so.* diff --git a/debian/libosmocore-dev.install b/debian/libosmocore-dev.install index eec0e15ea..ece5b0852 100644 --- a/debian/libosmocore-dev.install +++ b/debian/libosmocore-dev.install @@ -3,3 +3,4 @@ usr/lib/lib*.a usr/lib/lib*.so usr/lib/lib*.la usr/lib/pkgconfig/* +usr/share/doc/libosmocore/* diff --git a/debian/libosmocore.install b/debian/libosmocore.install index 933026091..e69de29bb 100644 --- a/debian/libosmocore.install +++ b/debian/libosmocore.install @@ -1,2 +0,0 @@ -usr/lib/lib*.so.* -usr/share/doc/libosmocore/* diff --git a/debian/libosmocore4.install b/debian/libosmocore4.install new file mode 100644 index 000000000..d1349023a --- /dev/null +++ b/debian/libosmocore4.install @@ -0,0 +1 @@ +usr/lib/libosmocore*.so.* diff --git a/debian/libosmogb2.install b/debian/libosmogb2.install new file mode 100644 index 000000000..73ad3d3e1 --- /dev/null +++ b/debian/libosmogb2.install @@ -0,0 +1 @@ +usr/lib/libosmogb*.so.* diff --git a/debian/libosmogsm4.install b/debian/libosmogsm4.install new file mode 100644 index 000000000..12c9180a9 --- /dev/null +++ b/debian/libosmogsm4.install @@ -0,0 +1 @@ +usr/lib/libosmogsm*.so.* diff --git a/debian/libosmovty0.install b/debian/libosmovty0.install new file mode 100644 index 000000000..1b993e87d --- /dev/null +++ b/debian/libosmovty0.install @@ -0,0 +1 @@ +usr/lib/libosmovty*.so.* diff --git a/debian/rules b/debian/rules index a60ca7aef..89abad911 100755 --- a/debian/rules +++ b/debian/rules @@ -14,11 +14,15 @@ DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1) VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') %: - dh --with autoreconf $@ --fail-missing + dh $@ --with autoreconf --fail-missing override_dh_strip: dh_strip --dbg-package=libosmocore-dbg +override_dh_install: + sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` + dh_install + override_dh_autoreconf: echo $(VERSION) > .tarball-version dh_autoreconf