From b2811c22e12268a975ed8df3fa90dda85c85da3f Mon Sep 17 00:00:00 2001
From: Thorsten Alteholz <debian@alteholz.de>
Date: Sun, 10 Jun 2018 22:11:12 +0200
Subject: Import Upstream version 1.13.0

---
 debian/changelog        | 36 +++++++++++++++++++++++++++++++++---
 debian/control          | 10 +++++-----
 debian/libsmpp0.install |  1 -
 debian/libsmpp1.install |  1 +
 debian/rules            |  4 ++++
 5 files changed, 43 insertions(+), 9 deletions(-)
 delete mode 100644 debian/libsmpp0.install
 create mode 100644 debian/libsmpp1.install

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index c0c3948..b8459ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libsmpp34 (1.12) UNRELEASED; urgency=medium
+libsmpp34 (1.13.0) unstable; urgency=medium
 
   [ Holger Hans Peter Freyther ]
   * Move forward towards a new release.
@@ -8,8 +8,38 @@ libsmpp34 (1.12) UNRELEASED; urgency=medium
   * SMPP_DELIVERY_RECEIPT_* constants
   * SMPP ESM class parameter definitions
   * smpp34_tlv_for_each() helper macro
-
- -- Harald Welte <laforge@nataraja.de.gnumonks.org>  Mon, 14 Aug 2017 19:08:37 +0200
+  * Fix 'make distcheck' by adding .version to EXTRA_DISTI
+  * debian/control: Fix Vcs-{Browser,Git} URLs
+
+  [ Max ]
+  * Use release helper from libosmocore
+  * Enable sanitize for CI tests
+
+  [ Pau Espin Pedrol ]
+  * smpp34_dumpBuf.c: remove unused variable
+  * smpp34_structs.h: Fix trailing whitespace
+  * smpp34_structs.h: Fix truncated output in str_tlv_id
+  * smpp34_unpack.c: remove unused variable
+  * bind_receiver_resp_test.c: Fix compilation warning
+  * Fix Out of bounds compilation warning in OCTET8
+  * contrib: Enable -Werror by default
+  * src/Makefile.am: Use LIBVERSION variable to set version-info
+
+  [ Alexander Couzens ]
+  * debian/rules: show testsuite.log when tests are failing
+
+  [ Neels Hofmeyr ]
+  * jenkins: use osmo-clean-workspace.sh before and after build
+  * add --enable-sanitize config option
+  * configure: add --enable-werror
+  * jenkins.sh: use --enable-werror configure flag, not CFLAGS
+
+  [ Martin Hauke ]
+  * binaries/Makefile.am: Fix parallel build issue
+  * jenkins: Enable parallel build and distcheck
+  * jenkins.sh: output all test logs when 'make check' failed
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Thu, 03 May 2018 18:04:10 +0200
 
 libsmpp34 (1.10z1) stable; urgency=low
 
diff --git a/debian/control b/debian/control
index e612a4f..be4a63b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,11 +13,11 @@ Build-Depends: debhelper (>= 9),
                pkg-config,
                libxml2-dev
 Standards-Version: 3.9.6
-Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmocore.git;a=summary
-Vcs-Git: git://git.osmocom.org/libosmocore.git
+Vcs-Browser: http://git.osmocom.org/libsmpp34/
+Vcs-Git: git://git.osmocom.org/libsmpp34.git
 Homepage: https://projects.osmocom.org/projects/libsmpp34
 
-Package: libsmpp0
+Package: libsmpp1
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -35,7 +35,7 @@ Package: libsmpp34-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libsmpp0 (= ${binary:Version}),
+Depends: libsmpp1 (= ${binary:Version}),
          ${misc:Depends}
 Description: Development files for libsmpp34
  This library is an implementation for providing the PDU handling of the
@@ -55,5 +55,5 @@ Package: libsmpp34-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: libsmpp0 (= ${binary:Version}), ${misc:Depends}
+Depends: libsmpp1 (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for libsmpp34
diff --git a/debian/libsmpp0.install b/debian/libsmpp0.install
deleted file mode 100644
index 3ddde58..0000000
--- a/debian/libsmpp0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff --git a/debian/libsmpp1.install b/debian/libsmpp1.install
new file mode 100644
index 0000000..3ddde58
--- /dev/null
+++ b/debian/libsmpp1.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index bedd9e0..4f472a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,3 +17,7 @@ override_dh_strip:
 override_dh_autoreconf:
 	echo $(VERSION) > .tarball-version
 	dh_autoreconf
+
+# Print test results in case of a failure
+override_dh_auto_test:
+	dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
-- 
cgit v1.2.3