[libosmo-abis] 03/03: More fixes to Debian packaging

Ruben Undheim rubund-guest at moszumanska.debian.org
Sun Dec 13 10:38:50 UTC 2015


This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository libosmo-abis.

commit 2b1733a11ed1ce5759edc44a6aaf8a096475aa51
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Dec 13 10:44:43 2015 +0100

    More fixes to Debian packaging
---
 debian/control                  | 46 ++++++++++++++-------
 debian/copyright                | 88 ++++++++++++++++------------------------
 debian/libosmo-abis-dev.install |  1 -
 debian/libosmoabis5.symbols     | 90 +++++++++++++++++++++++++++++++++++++++++
 debian/libosmotrau1.symbols     | 14 +++++++
 debian/rules                    |  6 ++-
 debian/watch                    |  2 +
 7 files changed, 176 insertions(+), 71 deletions(-)

diff --git a/debian/control b/debian/control
index 2c125f9..e2a1764 100644
--- a/debian/control
+++ b/debian/control
@@ -3,46 +3,62 @@ Section: libs
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ruben Undheim <ruben.undheim at gmail.com>
-Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libosmocore-dev (>= 0.6.4), pkg-config, libortp-dev
+Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
+               libdpkg-perl,
+               libosmocore-dev,
+               pkg-config,
+               libortp-dev
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/libosmo-abis.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/libosmocore.git
 Homepage: http://openbsc.osmocom.org/trac/wiki/libosmo-abis
 
-Package: libosmo-abis
-Section: oldlibs
-Architecture: any
-Depends: libosmoabis5 (= ${binary:Version}), libosmotrau1 (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: Legacy package for libosmo-abis
- libosmo-abis is an empty package helping in the transition to one
- package per DSO.
 
 Package: libosmoabis5
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same
 Description: GSM A-bis handling
+ This library contains common/shared code regarding the A-bis interface between
+ the GSM Base transceiver station (BTS) and the GSM Base station controller BSC.
+ .
+ It also implements drivers for mISDN and DAHDI based E1 cards, as well as some
+ A-bis/IP dialects.
 
 Package: libosmotrau1
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same
 Description: GSM trau handling
+ This library implements the Transcoder and Rate Adaptation Unit (TRAU) for
+ GSM systems. It is closely related to the libosmo-abis library.
+ .
+ TRAU performs transcoding function for speech channels and rate adaptation (RA)
+ for data channels in the GSM network.
 
 Package: libosmo-abis-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libosmotrau1 (= ${binary:Version}), libosmoabis5 (= ${binary:Version})
+Depends: ${misc:Depends},
+         libosmotrau1 (= ${binary:Version}),
+         libosmoabis5 (= ${binary:Version})
 Multi-Arch: same
-Description: Development headers for A-bis interface.
+Description: Development headers for A-bis interface
+ The libosmo-abis library contains common/shared code regarding the A-bis
+ interface between GSM BTS and BSC. This package in particular contains the
+ development files needed to develop with the libosmoabis and libosmotrau
+ libraries.
 
 Package: libosmo-abis-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: libosmoabis5 (= ${binary:Version}), libosmotrau1 (= ${binary:Version}), ${misc:Depends}
+Depends: libosmoabis5 (= ${binary:Version}),
+         libosmotrau1 (= ${binary:Version}),
+         ${misc:Depends}
 Multi-Arch: same
-Description: Debug symbols for A-bis interface.
+Description: Debug symbols for A-bis interface
+ The libosmo-abis library contains common/shared code regarding the A-bis
+ interface between GSM BTS and BSC. This package in particular contains the
+ debug symbols for the two libraries libosmoabis and libosmotrau.
diff --git a/debian/copyright b/debian/copyright
index 65e4402..4f502b1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,23 +4,39 @@ Source: git://git.osmocom.org/libosmocore.git
 
 Files: *
 Copyright: 2008      Daniel Willmann <daniel at totalueberwachung.de>
-           2008-2010 Harald Welte <laforge at gnumonks.org>
-           2008-2010 Holger Hans Peter Freyther <zecke at selfish.org>
-           2009-2010 Sylvain Munaut <tnt at 246tNt.com>
-           2009-2010 On-Waves
-           2010      Nico Golde <nico at ngolde.de>
+           2008-2012 Harald Welte <laforge at gnumonks.org>
+           2009-2010 Holger Hans Peter Freyther <zecke at selfish.org>
+           2010,2014 On-Waves
+           2011-2014 Pablo Neira Ayuso <pablo at gnumonks.org>
+           2012      Tobias Engel
+           2014      Sysmocom s.f.m.c. GmBH
+License: AGPL-3+
+
+Files: src/input/lapd.c
+       src/trau/osmo_ortp.c
+       src/input/dahdi.c
+Copyright: 2008-2011 Harald Welte <laforge at gnumonks.org>
+           2009      oystein at homelien.no
+           2009      Holger Hans Peter Freyther <zecke at selfish.org>
+           2010      Digium and Matthew Fredrickson <creslin at digium.com>
+           2011      Andreas Everberg <jolly at eversberg.eu>
 License: GPL-2+
 
+Files: include/mISDNif.h
+Copyright: 2008 Karsten Keil <kkeil at novell.com>
+License: LGPL-2.1
+
 Files: debian/*
-Copyright: 2010-2015 Harald Welte <laforge at gnumonks.org>
+Copyright: 2012 Eric Butler <eric at codebutler.com>
+           2012-2015 Holger Hans Peter Freyther <holger at moiji-mobile.com>
            2015 Ruben Undheim <ruben.undheim at gmail.com>
-License: GPL-3+
+License: AGPL-3+
 
 
-License: GPL-2+
- This package is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
+License: AGPL-3+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
  (at your option) any later version.
  .
  This program is distributed in the hope that it will be useful,
@@ -28,32 +44,14 @@ License: GPL-2+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  .
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-License: GPL-2
- This package is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, version 2 of the License.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-License: GPL-3+
+License: GPL-2+
  This package is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, version 2 of the License, or
  (at your option) any later version.
  .
  This program is distributed in the hope that it will be useful,
@@ -65,14 +63,13 @@ License: GPL-3+
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-License: LGPL-3+
+License: LGPL-2.1
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later version.
+ License as published by the Free Software Foundation;
+ version 2.1 of the License.
  .
  This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -83,19 +80,4 @@ License: LGPL-3+
  License along with this library; if not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU Lesser General
- Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
-
-
-License: AGPL-3+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU Affero General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
diff --git a/debian/libosmo-abis-dev.install b/debian/libosmo-abis-dev.install
index 465f933..76f28fa 100644
--- a/debian/libosmo-abis-dev.install
+++ b/debian/libosmo-abis-dev.install
@@ -1,5 +1,4 @@
 usr/include/*
 usr/lib/*/lib*.a
 usr/lib/*/lib*.so
-usr/lib/*/lib*.la
 usr/lib/*/pkgconfig/*
diff --git a/debian/libosmoabis5.symbols b/debian/libosmoabis5.symbols
new file mode 100644
index 0000000..5d633fd
--- /dev/null
+++ b/debian/libosmoabis5.symbols
@@ -0,0 +1,90 @@
+libosmoabis.so.5 libosmoabis5 #MINVER#
+ abis_rsl_sendmsg at Base 0.3.2+git86fc3c8
+ abis_sendmsg at Base 0.3.2+git86fc3c8
+ decode_trau_frame at Base 0.3.2+git86fc3c8
+ e1_set_pcap_fd at Base 0.3.2+git86fc3c8
+ e1inp_close_socket at Base 0.3.2+git86fc3c8
+ e1inp_dlsap_up at Base 0.3.2+git86fc3c8
+ e1inp_driver_find at Base 0.3.2+git86fc3c8
+ e1inp_driver_list at Base 0.3.2+git86fc3c8
+ e1inp_driver_register at Base 0.3.2+git86fc3c8
+ e1inp_event at Base 0.3.2+git86fc3c8
+ e1inp_get_mux at Base 0.3.2+git86fc3c8
+ e1inp_init at Base 0.3.2+git86fc3c8
+ e1inp_ipa_bts_rsl_connect at Base 0.3.2+git86fc3c8
+ e1inp_ipa_bts_rsl_connect_n at Base 0.3.2+git86fc3c8
+ e1inp_ipaccess_init at Base 0.3.2+git86fc3c8
+ e1inp_line_bind_ops at Base 0.3.2+git86fc3c8
+ e1inp_line_clone at Base 0.3.2+git86fc3c8
+ e1inp_line_create at Base 0.3.2+git86fc3c8
+ e1inp_line_find at Base 0.3.2+git86fc3c8
+ e1inp_line_get at Base 0.3.2+git86fc3c8
+ e1inp_line_list at Base 0.3.2+git86fc3c8
+ e1inp_line_put at Base 0.3.2+git86fc3c8
+ e1inp_line_update at Base 0.3.2+git86fc3c8
+ e1inp_lookup_sign_link at Base 0.3.2+git86fc3c8
+ e1inp_misdn_init at Base 0.3.2+git86fc3c8
+ e1inp_node at Base 0.3.2+git86fc3c8
+ e1inp_rs232_init at Base 0.3.2+git86fc3c8
+ e1inp_rx_ts at Base 0.3.2+git86fc3c8
+ e1inp_rx_ts_lapd at Base 0.3.2+git86fc3c8
+ e1inp_sign_link_create at Base 0.3.2+git86fc3c8
+ e1inp_sign_link_destroy at Base 0.3.2+git86fc3c8
+ e1inp_signtype_name at Base 0.3.2+git86fc3c8
+ e1inp_ts_config_sign at Base 0.3.2+git86fc3c8
+ e1inp_ts_config_trau at Base 0.3.2+git86fc3c8
+ e1inp_tstype_name at Base 0.3.2+git86fc3c8
+ e1inp_tx_ts at Base 0.3.2+git86fc3c8
+ e1inp_vty_init at Base 0.3.2+git86fc3c8
+ encode_trau_frame at Base 0.3.2+git86fc3c8
+ ft_data_down_bits at Base 0.3.2+git86fc3c8
+ ft_fr_down_bits at Base 0.3.2+git86fc3c8
+ ft_idle_down_bits at Base 0.3.2+git86fc3c8
+ ipa_client_conn_clear_queue at Base 0.3.2+git86fc3c8
+ ipa_client_conn_close at Base 0.3.2+git86fc3c8
+ ipa_client_conn_create at Base 0.3.2+git86fc3c8
+ ipa_client_conn_destroy at Base 0.3.2+git86fc3c8
+ ipa_client_conn_open at Base 0.3.2+git86fc3c8
+ ipa_client_conn_send at Base 0.3.2+git86fc3c8
+ ipa_msg_push_header at Base 0.3.2+git86fc3c8
+ ipa_node at Base 0.3.2+git86fc3c8
+ ipa_proxy_vty_init at Base 0.3.2+git86fc3c8
+ ipa_server_conn_create at Base 0.3.2+git86fc3c8
+ ipa_server_conn_destroy at Base 0.3.2+git86fc3c8
+ ipa_server_conn_send at Base 0.3.2+git86fc3c8
+ ipa_server_link_close at Base 0.3.2+git86fc3c8
+ ipa_server_link_create at Base 0.3.2+git86fc3c8
+ ipa_server_link_destroy at Base 0.3.2+git86fc3c8
+ ipa_server_link_open at Base 0.3.2+git86fc3c8
+ ipaccess_bts_handle_ccm at Base 0.3.2+git86fc3c8
+ ipaccess_driver at Base 0.3.2+git86fc3c8
+ ipaccess_fd_cb at Base 0.3.2+git86fc3c8
+ lapd_instance_alloc at Base 0.3.2+git86fc3c8
+ lapd_instance_free at Base 0.3.2+git86fc3c8
+ lapd_profile_abis at Base 0.3.2+git86fc3c8
+ lapd_profile_isdn at Base 0.3.2+git86fc3c8
+ lapd_profile_sat at Base 0.3.2+git86fc3c8
+ lapd_receive at Base 0.3.2+git86fc3c8
+ lapd_sap_start at Base 0.3.2+git86fc3c8
+ lapd_sap_stop at Base 0.3.2+git86fc3c8
+ lapd_tei_alloc at Base 0.3.2+git86fc3c8
+ lapd_tei_states at Base 0.3.2+git86fc3c8
+ lapd_transmit at Base 0.3.2+git86fc3c8
+ libosmo_abis_ctx at Base 0.3.2+git86fc3c8
+ libosmo_abis_init at Base 0.3.2+git86fc3c8
+ misdn_driver at Base 0.3.2+git86fc3c8
+ misdn_lapd_driver at Base 0.3.2+git86fc3c8
+ osmo_pcap_lapd_close at Base 0.3.2+git86fc3c8
+ osmo_pcap_lapd_open at Base 0.3.2+git86fc3c8
+ osmo_pcap_lapd_write at Base 0.3.2+git86fc3c8
+ prim_names at Base 0.3.2+git86fc3c8
+ subch_demux_activate at Base 0.3.2+git86fc3c8
+ subch_demux_deactivate at Base 0.3.2+git86fc3c8
+ subch_demux_in at Base 0.3.2+git86fc3c8
+ subch_demux_init at Base 0.3.2+git86fc3c8
+ subchan_mux_enqueue at Base 0.3.2+git86fc3c8
+ subchan_mux_init at Base 0.3.2+git86fc3c8
+ subchan_mux_out at Base 0.3.2+git86fc3c8
+ tall_tqe_ctx at Base 0.3.2+git86fc3c8
+ trau_frame_up2down at Base 0.3.2+git86fc3c8
+ trau_idle_frame at Base 0.3.2+git86fc3c8
diff --git a/debian/libosmotrau1.symbols b/debian/libosmotrau1.symbols
new file mode 100644
index 0000000..f72e61f
--- /dev/null
+++ b/debian/libosmotrau1.symbols
@@ -0,0 +1,14 @@
+libosmotrau.so.1 libosmotrau1 #MINVER#
+ osmo_rtp_get_bound_addr at Base 0.3.2+git86fc3c8
+ osmo_rtp_get_bound_ip_port at Base 0.3.2+git86fc3c8
+ osmo_rtp_init at Base 0.3.2+git86fc3c8
+ osmo_rtp_send_frame at Base 0.3.2+git86fc3c8
+ osmo_rtp_socket_bind at Base 0.3.2+git86fc3c8
+ osmo_rtp_socket_connect at Base 0.3.2+git86fc3c8
+ osmo_rtp_socket_create at Base 0.3.2+git86fc3c8
+ osmo_rtp_socket_free at Base 0.3.2+git86fc3c8
+ osmo_rtp_socket_log_stats at Base 0.3.2+git86fc3c8
+ osmo_rtp_socket_poll at Base 0.3.2+git86fc3c8
+ osmo_rtp_socket_set_param at Base 0.3.2+git86fc3c8
+ osmo_rtp_socket_set_pt at Base 0.3.2+git86fc3c8
+ osmo_rtp_socket_stats at Base 0.3.2+git86fc3c8
diff --git a/debian/rules b/debian/rules
index d3f1534..ec7310b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,13 @@ DEBIAN  := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
 DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1)
 VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
 
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 #export DH_VERBOSE=1
-export DEB_BUILD_HARDENING=1
 
 %:
-	dh $@ --with autoreconf --fail-missing
+	dh $@ --with autoreconf
 
 override_dh_strip:
 	dh_strip --dbg-package=libosmo-abis-dbg
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..3a54a41
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://github.com/osmocom/libosmo-abis/releases /osmocom/libosmo-abis/archive/(\d\S+)\.tar\.(?:bz2|gz|xz)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libosmo-abis.git



More information about the debian-science-commits mailing list