Merge remote-tracking branch 'origin/master' into daniel/onwaves

Change-Id: Icec9088111e1d04d81fa1c25183c2b13604b85ea

4 files changed, 20 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index bd9e896..3538d97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,18 @@
-libosmo-netif (0.2.0+ow1) UNRELEASED; urgency=medium
+libosmo-netif (0.3.0) unstable; urgency=medium
+
+  [ Pau Espin Pedrol ]
+  * tests: jibuf_test: Set some functions as static
+  * tests: jibuf_test: Add scenario to show out-of-order bug
+  * jibuf: Fix out-of-order seq queue around syncpoints
+  * osmux: change log lvl of batch full to debug
+
+  [ Harald Welte ]
+  * remove "channel" layer
+  * stream.c: Use non-blocking connect in osmo_stream_cli
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Fri, 27 Jul 2018 18:31:42 +0200
+
+libosmo-netif (0.2.0+ow1) unstable; urgency=medium
 
   * Release new version for On-Waves
   * Commit 7839556ca950f02e2dda48f8e10dd68e90266926
diff --git a/debian/control b/debian/control
index cec723d..b6bc17d 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Vcs-Browser: http://git.osmocom.org/libosmo-netif/
 Vcs-Git: git://git.osmocom.org/libosmo-netif.git
 Homepage: https://projects.osmocom.org/projects/libosmo-netif
 
-Package: libosmonetif4
+Package: libosmonetif6
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -38,7 +38,7 @@ Architecture: any
 Depends: ${misc:Depends},
          libosmocore-dev,
          libosmocore,
-         libosmonetif4 (= ${binary:Version})
+         libosmonetif6 (= ${binary:Version})
 Multi-Arch: same
 Description: Development headers for Osmocom network interface
  The libosmo-netif library is one of the libraries needed by the
@@ -52,7 +52,7 @@ Package: libosmo-netif-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends},
-         libosmonetif4,
+         libosmonetif6,
          libjs-jquery
 Description: Documentation for the Osmo network interface library
  The libosmo-netif library is one of the libraries needed by the
@@ -65,7 +65,7 @@ Package: libosmo-netif-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: libosmonetif4 (= ${binary:Version}), ${misc:Depends}
+Depends: libosmonetif6 (= ${binary:Version}), ${misc:Depends}
 Multi-Arch: same
 Description: Debug symbols for Osmocom network interface library
  The libosmo-netif library is one of the libraries needed by the
diff --git a/debian/libosmonetif4.install b/debian/libosmonetif6.install
index 7a36b86..7a36b86 100644
--- a/debian/libosmonetif4.install
+++ b/debian/libosmonetif6.install
diff --git a/debian/rules b/debian/rules
index f0e00c5..4472bd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,17 +15,13 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 override_dh_strip:
 	dh_strip --dbg-package=libosmo-netif-dbg
 
-override_dh_autoreconf:
-	echo $(VERSION) > .tarball-version
-	dh_autoreconf
-
 override_dh_install:
 	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
 	dh_install
 
 override_dh_clean:
 	dh_clean
-	rm -f tests/package.m4 tests/testsuite .version .tarball-version
+	rm -f tests/package.m4 tests/testsuite .version
 
 override_dh_auto_test:
 	dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)