libosmo-abis (0.4.0-2) unstable; urgency=medium

  * move to unstable
  * debian/control: bump standard to 4.1.4 (no changes)
  * debian/control: add salsa URLs
  * debian/control: use dh11

[dgit import unpatched libosmo-abis 0.4.0-2]

15 files changed, 212 insertions, 97 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 0000000..c6cdc7e
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
+# see git-dpm(1) from git-dpm package
+86fc3c8787a9c29f566a44969d528a604ee7e11f
+86fc3c8787a9c29f566a44969d528a604ee7e11f
+86fc3c8787a9c29f566a44969d528a604ee7e11f
+86fc3c8787a9c29f566a44969d528a604ee7e11f
+libosmo-abis_0.3.2+20151106git86fc3c8.orig.tar.gz
+699c4bfbda9f6e9817ba30d9aefec489ccacc2ab
+73635
diff --git a/debian/changelog b/debian/changelog
index 13c0996..4ce5223 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,63 +1,45 @@
-libosmo-abis (0.4.0) unstable; urgency=medium
+libosmo-abis (0.4.0-2) unstable; urgency=medium
 
-  * Move forward towards a new release.
-  * libosmo-abis   API change      major: add parameter to struct
-    input_signal_data
-  * libosmo-trau   API change      major: add parameters to rx_cb()
-    callack in osmo_ortp.h
+  * move to unstable
+  * debian/control: bump standard to 4.1.4 (no changes)
+  * debian/control: add salsa URLs
+  * debian/control: use dh11
 
- -- Holger Hans Peter Freyther <holger@moiji-mobile.com>  Fri, 25 Aug 2017 16:09:46 +0200
+ -- Thorsten Alteholz <debian@alteholz.de>  Mon, 09 Apr 2018 18:55:37 +0100
 
-libosmo-abis (0.3.2) unstable; urgency=medium
+libosmo-abis (0.4.0-1) experimental; urgency=medium
 
-  * Bump so version to re-link libosmovty
-
- -- Holger Hans Peter Freyther <holger@moiji-mobile.com>  Tue, 03 Nov 2015 09:42:01 +0100
-
-libosmo-abis (0.3.1) unstable; urgency=medium
-
-  * New upstream release of libosmo-abis
-
- -- Holger Hans Peter Freyther <holger@freyther.de>  Sun, 18 Jan 2015 19:26:40 +0100
-
-libosmo-abis (0.3.0) unstable; urgency=medium
-
-  * New upstream release of libosmo-abis
-
- -- Holger Hans Peter Freyther <holger@freyther.de>  Mon, 08 Sep 2014 07:29:39 +0200
-
-libosmo-abis (0.2.0) unstable; urgency=medium
-
-  * New upstream release of libosmo-abis
-
- -- Holger Hans Peter Freyther <holger@freyther.de>  Mon, 08 Sep 2014 07:29:19 +0200
-
-libosmo-abis (0.1.6) unstable; urgency=medium
-
-  * New upstream release of libosmo-abis
-
- -- Holger Hans Peter Freyther <holger@freyther.de>  Mon, 20 Jan 2014 10:33:36 +0100
-
-libosmo-abis (0.1.5+git1) unstable; urgency=low
-
-  * Rebuild 0.1.5 with the right libosmocore depedency
+  * New upstream release
+  * debian/control: SONAME bump of libosmoabis6 and libosmotrau2
+  * debian/control: bump standard to 4.1.1 (no changes)
+  * update symbols files
+  * add spelling patch
 
- -- Holger Hans Peter Freyther <holger@freyther.de>  Thu, 12 Dec 2013 11:47:01 +0100
+ -- Thorsten Alteholz <debian@alteholz.de>  Tue, 28 Nov 2017 18:55:37 +0100
 
-libosmo-abis (0.1.4) unstable; urgency=low
+libosmo-abis (0.3.2+20151106git86fc3c8-3) unstable; urgency=medium
 
-  * New upstream release
+  * debian/control: add myself to uploaders
+  * debian/control: move package to debian-mobcom and change URLs
+  * debian/control: change maintainer to debian-mobcom-maintainers
+  * debian/control: use dh10
+  * debian/control: bump standard to 4.1.0 (no changes)
+  * debian/control: remove dbg package
+  * debian/control: remove redundant dependency of dh-autoreconf
 
- -- Holger Hans Peter Freyther <holger@freyther.de>  Tue, 06 Nov 2012 13:33:45 +0100
+ -- Thorsten Alteholz <debian@alteholz.de>  Mon, 11 Sep 2017 19:52:59 +0200
 
-libosmo-abis (0.1.3+git3-1) precise; urgency=low
+libosmo-abis (0.3.2+20151106git86fc3c8-2) unstable; urgency=medium
 
-  * Fix version issue.
+  * debian/control:
+    - Fixed Vcs-Git url
+    - Ran "cme fix dpkg-control"
+      - Standards to 3.9.7 - no needed changes
 
- -- Eric Butler <eric@codebutler.com>  Tue, 14 Aug 2012 20:50:50 -0700
+ -- Ruben Undheim <ruben.undheim@gmail.com>  Wed, 10 Feb 2016 19:46:52 +0100
 
-libosmo-abis (0.1.3+git3) precise; urgency=low
+libosmo-abis (0.3.2+20151106git86fc3c8-1) unstable; urgency=low
 
-  Created new Ubuntu package.
+  * Initial release (Closes: #806582)
 
- -- Eric Butler <eric@codebutler.com>  Tue, 14 Aug 2012 13:00:18 -0700
+ -- Ruben Undheim <ruben.undheim@gmail.com>  Sun, 13 Dec 2015 10:25:30 +0100
diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index 5df6c95..4f47e37 100644
--- a/debian/control
+++ b/debian/control
@@ -1,34 +1,21 @@
 Source: libosmo-abis
-Maintainer: Harald Welte <laforge@gnumonks.org>
+Maintainer: Debian Mobcom Maintainers <Debian-mobcom-maintainers@lists.alioth.debian.org>
+Uploaders: Ruben Undheim <ruben.undheim@gmail.com>
+	, Thorsten Alteholz <debian@alteholz.de>
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>= 9),
-               autotools-dev,
-               autoconf,
-               automake,
-               libtool,
-               dh-autoreconf,
+Build-Depends: debhelper (>= 11),
                libdpkg-perl,
-               git,
-               libosmocore-dev (>= 0.6.4),
+               libosmocore-dev (>= 0.9.1),
+               libtalloc-dev,
                pkg-config,
                libortp-dev
-Standards-Version: 3.9.7
-Vcs-Git: git://git.osmocom.org/libosmo-abis.git
-Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmo-abis.git;a=summary
-Homepage: https://projects.osmocom.org/projects/libosmo-abis
+Standards-Version: 4.1.4
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-mobcom/libosmo-abis.git
+Vcs-Git: https://anonscm.debian.org/git/debian-mobcom/libosmo-abis.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
+Package: libosmoabis6
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
@@ -40,8 +27,7 @@ Description: GSM A-bis handling
  It also implements drivers for mISDN and DAHDI based E1 cards, as well as some
  A-bis/IP dialects.
 
-Package: libosmotrau1
-Section: libs
+Package: libosmotrau2
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
@@ -58,23 +44,23 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
-         libosmotrau1 (= ${binary:Version}),
-         libosmoabis5 (= ${binary:Version})
+         libosmotrau2 (= ${binary:Version}),
+         libosmoabis6 (= ${binary:Version})
 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
-Architecture: any
-Multi-Arch: same
-Section: debug
-Priority: extra
-Depends: libosmoabis5 (= ${binary:Version}),
-         libosmotrau1 (= ${binary:Version}),
-         ${misc:Depends}
-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.
+#Package: libosmo-abis-dbg
+#Architecture: any
+#Multi-Arch: same
+#Section: debug
+#Priority: extra
+#Depends: libosmoabis6 (= ${binary:Version}),
+#         libosmotrau2 (= ${binary:Version}),
+#         ${misc:Depends}
+#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 fdcf686..26b3877 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libosmocore
 Source: git://git.osmocom.org/libosmo-abis.git
 
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.install b/debian/libosmoabis6.install
index 79c51a9..79c51a9 100644
--- a/debian/libosmoabis5.install
+++ b/debian/libosmoabis6.install
diff --git a/debian/libosmoabis6.symbols b/debian/libosmoabis6.symbols
new file mode 100644
index 0000000..5b9c03b
--- /dev/null
+++ b/debian/libosmoabis6.symbols
@@ -0,0 +1,105 @@
+libosmoabis.so.6 libosmoabis6 #MINVER#
+ abis_rsl_sendmsg@Base 0.4.0
+ abis_sendmsg@Base 0.4.0
+ decode_trau_frame@Base 0.4.0
+ e1_set_pcap_fd@Base 0.4.0
+ e1inp_close_socket@Base 0.4.0
+ e1inp_dlsap_up@Base 0.4.0
+ e1inp_driver_find@Base 0.4.0
+ e1inp_driver_list@Base 0.4.0
+ e1inp_driver_register@Base 0.4.0
+ e1inp_ericsson_set_altc@Base 0.4.0
+ e1inp_event@Base 0.4.0
+ e1inp_get_mux@Base 0.4.0
+ e1inp_init@Base 0.4.0
+ e1inp_ipa_bts_rsl_connect@Base 0.4.0
+ e1inp_ipa_bts_rsl_connect_n@Base 0.4.0
+ e1inp_ipa_get_bind_addr@Base 0.4.0
+ e1inp_ipa_set_bind_addr@Base 0.4.0
+ e1inp_ipaccess_init@Base 0.4.0
+ e1inp_line_bind_ops@Base 0.4.0
+ e1inp_line_clone@Base 0.4.0
+ e1inp_line_create@Base 0.4.0
+ e1inp_line_find@Base 0.4.0
+ e1inp_line_get@Base 0.4.0
+ e1inp_line_list@Base 0.4.0
+ e1inp_line_put@Base 0.4.0
+ e1inp_line_update@Base 0.4.0
+ e1inp_lookup_sign_link@Base 0.4.0
+ e1inp_misdn_init@Base 0.4.0
+ e1inp_node@Base 0.4.0
+ e1inp_rs232_init@Base 0.4.0
+ e1inp_rx_ts@Base 0.4.0
+ e1inp_rx_ts_lapd@Base 0.4.0
+ e1inp_sign_link_create@Base 0.4.0
+ e1inp_sign_link_destroy@Base 0.4.0
+ e1inp_sign_type_names@Base 0.4.0
+ e1inp_signal_names@Base 0.4.0
+ e1inp_signtype_name@Base 0.4.0
+ e1inp_ts_config_hdlc@Base 0.4.0
+ e1inp_ts_config_raw@Base 0.4.0
+ e1inp_ts_config_sign@Base 0.4.0
+ e1inp_ts_config_trau@Base 0.4.0
+ e1inp_ts_type_names@Base 0.4.0
+ e1inp_tstype_name@Base 0.4.0
+ e1inp_tx_ts@Base 0.4.0
+ e1inp_unixsocket_init@Base 0.4.0
+ e1inp_vty_init@Base 0.4.0
+ encode_trau_frame@Base 0.4.0
+ ft_data_down_bits@Base 0.4.0
+ ft_fr_down_bits@Base 0.4.0
+ ft_idle_down_bits@Base 0.4.0
+ ipa_client_conn_clear_queue@Base 0.4.0
+ ipa_client_conn_close@Base 0.4.0
+ ipa_client_conn_create@Base 0.4.0
+ ipa_client_conn_destroy@Base 0.4.0
+ ipa_client_conn_open@Base 0.4.0
+ ipa_client_conn_send@Base 0.4.0
+ ipa_msg_push_header@Base 0.4.0
+ ipa_node@Base 0.4.0
+ ipa_proxy_vty_init@Base 0.4.0
+ ipa_server_conn_ccm@Base 0.4.0
+ ipa_server_conn_create@Base 0.4.0
+ ipa_server_conn_destroy@Base 0.4.0
+ ipa_server_conn_send@Base 0.4.0
+ ipa_server_link_close@Base 0.4.0
+ ipa_server_link_create@Base 0.4.0
+ ipa_server_link_destroy@Base 0.4.0
+ ipa_server_link_open@Base 0.4.0
+ ipaccess_bts_handle_ccm@Base 0.4.0
+ ipaccess_driver@Base 0.4.0
+ ipaccess_fd_cb@Base 0.4.0
+ lapd_instance_alloc@Base 0.4.0
+ lapd_instance_free@Base 0.4.0
+ lapd_instance_set_profile@Base 0.4.0
+ lapd_profile_abis@Base 0.4.0
+ lapd_profile_abis_ericsson@Base 0.4.0
+ lapd_profile_isdn@Base 0.4.0
+ lapd_profile_sat@Base 0.4.0
+ lapd_receive@Base 0.4.0
+ lapd_sap_start@Base 0.4.0
+ lapd_sap_stop@Base 0.4.0
+ lapd_tei_alloc@Base 0.4.0
+ lapd_tei_states@Base 0.4.0
+ lapd_transmit@Base 0.4.0
+ libosmo_abis_ctx@Base 0.4.0
+ libosmo_abis_init@Base 0.4.0
+ misdn_driver@Base 0.4.0
+ misdn_lapd_driver@Base 0.4.0
+ osmo_pcap_lapd_close@Base 0.4.0
+ osmo_pcap_lapd_open@Base 0.4.0
+ osmo_pcap_lapd_set_fd@Base 0.4.0
+ osmo_pcap_lapd_write@Base 0.4.0
+ prim_names@Base 0.4.0
+ subch_demux_activate@Base 0.4.0
+ subch_demux_deactivate@Base 0.4.0
+ subch_demux_in@Base 0.4.0
+ subch_demux_init@Base 0.4.0
+ subchan_mux_enqueue@Base 0.4.0
+ subchan_mux_init@Base 0.4.0
+ subchan_mux_out@Base 0.4.0
+ tall_tqe_ctx@Base 0.4.0
+ tall_unixsocket_ctx@Base 0.4.0
+ trau_frame_up2down@Base 0.4.0
+ trau_idle_frame@Base 0.4.0
+ unixsocket_driver@Base 0.4.0
diff --git a/debian/libosmotrau1.install b/debian/libosmotrau2.install
index 5a25619..5a25619 100644
--- a/debian/libosmotrau1.install
+++ b/debian/libosmotrau2.install
diff --git a/debian/libosmotrau2.symbols b/debian/libosmotrau2.symbols
new file mode 100644
index 0000000..8fce9ea
--- /dev/null
+++ b/debian/libosmotrau2.symbols
@@ -0,0 +1,16 @@
+libosmotrau.so.2 libosmotrau2 #MINVER#
+ osmo_rtp_get_bound_addr@Base 0.4.0
+ osmo_rtp_get_bound_ip_port@Base 0.4.0
+ osmo_rtp_init@Base 0.4.0
+ osmo_rtp_send_frame@Base 0.4.0
+ osmo_rtp_send_frame_ext@Base 0.4.0
+ osmo_rtp_skipped_frame@Base 0.4.0
+ osmo_rtp_socket_bind@Base 0.4.0
+ osmo_rtp_socket_connect@Base 0.4.0
+ osmo_rtp_socket_create@Base 0.4.0
+ osmo_rtp_socket_free@Base 0.4.0
+ osmo_rtp_socket_log_stats@Base 0.4.0
+ osmo_rtp_socket_poll@Base 0.4.0
+ osmo_rtp_socket_set_param@Base 0.4.0
+ osmo_rtp_socket_set_pt@Base 0.4.0
+ osmo_rtp_socket_stats@Base 0.4.0
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5299247
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
new file mode 100644
index 0000000..a123a1c
--- /dev/null
+++ b/debian/patches/spelling.patch
@@ -0,0 +1,15 @@
+Description: fix spelling that was detected by lintian
+Author: Thorsten Alteholz <debian@alteholz.de>
+Index: libosmo-abis-0.4.0/src/input/ipa.c
+===================================================================
+--- libosmo-abis-0.4.0.orig/src/input/ipa.c	2017-08-25 16:12:37.000000000 +0200
++++ libosmo-abis-0.4.0/src/input/ipa.c	2017-11-28 15:29:11.274860753 +0100
+@@ -265,7 +265,7 @@
+ 	ret = link->accept_cb(link, fd);
+ 	if (ret < 0) {
+ 		LOGP(DLINP, LOGL_ERROR,
+-		     "failed to processs accept()ed new link, "
++		     "failed to process accept()ed new link, "
+ 		     "reason=`%s'\n", strerror(-ret));
+ 		close(fd);
+ 		return ret;
diff --git a/debian/rules b/debian/rules
index cec3c9f..1680694 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,15 +4,16 @@ 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 DH_VERBOSE=1
 
 %:
-	dh $@ --with autoreconf --fail-missing
+	dh $@ --with autoreconf
 
-override_dh_strip:
-	dh_strip --dbg-package=libosmo-abis-dbg
+#override_dh_strip:
+#	dh_strip --dbg-package=libosmo-abis-dbg
 
 override_dh_autoreconf:
 	echo $(VERSION) > .tarball-version
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..892feca
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=4
+opts="mode=git, dversionmangle=s/\+ds//" https://git.osmocom.org/libosmo-abis refs/tags/([\d\.]+) debian uupdate