14 files changed, 120 insertions, 88 deletions
diff --git a/debian/changelog b/debian/changelog
index b8459ad..02583fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,54 +1,41 @@
-libsmpp34 (1.13.0) unstable; urgency=medium
+libsmpp34 (1.13.0-1) experimental; urgency=medium
 
-  [ Holger Hans Peter Freyther ]
-  * Move forward towards a new release.
+  * New upstream release and SONAME bump
 
-  [ Harald Welte ]
-  * it's been four years with various cleanups
-  * SMPP_DELIVERY_RECEIPT_* constants
-  * SMPP ESM class parameter definitions
-  * smpp34_tlv_for_each() helper macro
-  * Fix 'make distcheck' by adding .version to EXTRA_DISTI
-  * debian/control: Fix Vcs-{Browser,Git} URLs
+ -- Thorsten Alteholz <debian@alteholz.de>  Tue, 15 May 2018 23:03:33 +0200
 
-  [ Max ]
-  * Use release helper from libosmocore
-  * Enable sanitize for CI tests
+libsmpp34 (1.12.0-2) unstable; urgency=medium
 
-  [ 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
+  * move to unstable
+  * debian/control: move to debian-mobcom maintainer
+  * debian/control: add salsa URLs
+  * debian/control: use dh11
+  * debian/control: bump standard to 4.1.4 (no changes)
+  * debian/rules: set DH_BUILD_MAINT_OPTIONS instead of DH_BUILD_OPTIONS
 
-  [ Alexander Couzens ]
-  * debian/rules: show testsuite.log when tests are failing
+ -- Thorsten Alteholz <debian@alteholz.de>  Mon, 09 Apr 2018 19:47:14 +0100
 
-  [ 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
+libsmpp34 (1.12.0-1) experimental; urgency=medium
 
-  [ 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
+  * New upstream release (use osmocom fork now)
 
- -- Pau Espin Pedrol <pespin@sysmocom.de>  Thu, 03 May 2018 18:04:10 +0200
+ -- Thorsten Alteholz <debian@alteholz.de>  Sat, 09 Dec 2017 17:14:27 +0100
 
-libsmpp34 (1.10z1) stable; urgency=low
+libsmpp34 (1.10-2) unstable; urgency=low
 
-  * Add depedency from libsmpp34-dev to the main library
+  * 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.2 (no changes)
+  * debian/control: remove redundant dependency of dh-autoreconf
+  * debian/control: add pkg-config dependency
+  * debian/rules: don't allow parallel builds
 
- -- Holger Hans Peter Freyther <holger@freyther.de>  Tue, 24 Sep 2013 13:33:45 +0200
+ -- Thorsten Alteholz <debian@alteholz.de>  Fri, 08 Dec 2017 18:49:29 +0100
 
-libsmpp34 (1.10) stable; urgency=low
+libsmpp34 (1.10-1) unstable; urgency=low
 
-  * Initial release.
+  * Initial release (Closes: #813295)
 
- -- Holger Hans Peter Freyther <holger@freyther.de>  Sun, 22 Sep 2013 14:34:19 +0200
+ -- Ruben Undheim <ruben.undheim@gmail.com>  Fri, 05 Feb 2016 12:45:23 +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 be4a63b..ce9680c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,24 +1,18 @@
 Source: libsmpp34
-Maintainer: Holger Freyther <holger@moiji-mobile.com>
+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,
-               libdpkg-perl,
-               git,
-               pkg-config,
-               libxml2-dev
-Standards-Version: 3.9.6
-Vcs-Browser: http://git.osmocom.org/libsmpp34/
-Vcs-Git: git://git.osmocom.org/libsmpp34.git
-Homepage: https://projects.osmocom.org/projects/libsmpp34
+Build-Depends: debhelper (>= 11),
+             , libxml2-dev
+             , pkg-config
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/debian-mobcom-team/libsmpp34
+Vcs-Git: https://salsa.debian.org/debian-mobcom-team/libsmpp34.git
+Homepage: http://c-open-smpp-34.sourceforge.net/
 
-Package: libsmpp1
-Section: libs
+Package: libsmpp34-1
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
@@ -35,7 +29,7 @@ Package: libsmpp34-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libsmpp1 (= ${binary:Version}),
+Depends: libsmpp34-1 (= ${binary:Version}),
          ${misc:Depends}
 Description: Development files for libsmpp34
  This library is an implementation for providing the PDU handling of the
@@ -45,15 +39,3 @@ Description: Development files for libsmpp34
  Messaging Entities, Routing Entitites and Message Centres.
  .
  This package contains the development files for the library.
-
-Package: libsmpp34-utils
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Utilities for SMPP
-
-Package: libsmpp34-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: libsmpp1 (= ${binary:Version}), ${misc:Depends}
-Description: Debug symbols for libsmpp34
diff --git a/debian/copyright b/debian/copyright
index f92bc83..f1b2266 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: libsmpp34
 Source: http://c-open-smpp-34.sourceforge.net/
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/libsmpp34-1.docs b/debian/libsmpp34-1.docs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/debian/libsmpp34-1.docs
diff --git a/debian/libsmpp1.install b/debian/libsmpp34-1.install
index 3ddde58..3ddde58 100644
--- a/debian/libsmpp1.install
+++ b/debian/libsmpp34-1.install
diff --git a/debian/libsmpp34-1.symbols b/debian/libsmpp34-1.symbols
new file mode 100644
index 0000000..e150344
--- /dev/null
+++ b/debian/libsmpp34-1.symbols
@@ -0,0 +1,29 @@
+libsmpp34.so.1 libsmpp34-1 #MINVER#
+ build_dad@Base 1.10
+ build_tlv@Base 1.10
+ build_udad@Base 1.10
+ destroy_dad@Base 1.10
+ destroy_tlv@Base 1.10
+ destroy_udad@Base 1.10
+ nothing@Base 1.10
+ ptrerror@Base 1.10
+ smpp34_dumpBuf@Base 1.10
+ smpp34_dumpPdu2@Base 1.10
+ smpp34_dumpPdu@Base 1.10
+ smpp34_errno@Base 1.10
+ smpp34_pack2@Base 1.10
+ smpp34_pack@Base 1.10
+ smpp34_strerror@Base 1.10
+ smpp34_unpack2@Base 1.10
+ smpp34_unpack@Base 1.10
+ str_addr_npi@Base 1.10
+ str_addr_ton@Base 1.10
+ str_command_id@Base 1.10
+ str_command_status@Base 1.10
+ str_tlv_id@Base 1.10
+ test_dest_flag@Base 1.10
+ test_interface_version@Base 1.10
+ test_sequence_number@Base 1.10
+ valueDec_08@Base 1.10
+ valueDec_16@Base 1.10
+ valueDec_32@Base 1.10
diff --git a/debian/libsmpp34-dev.install b/debian/libsmpp34-dev.install
index 91180f6..7df81cd 100644
--- a/debian/libsmpp34-dev.install
+++ b/debian/libsmpp34-dev.install
@@ -1,5 +1,3 @@
 usr/include/*
 usr/lib/*/lib*.so
-usr/lib/*/*.a
-usr/lib/*/lib*.la
 usr/lib/*/pkgconfig/*
diff --git a/debian/libsmpp34.pc.in b/debian/libsmpp34.pc.in
new file mode 100644
index 0000000..d6401b7
--- /dev/null
+++ b/debian/libsmpp34.pc.in
@@ -0,0 +1,11 @@
+prefix=$PREFIX
+exec_prefix=${prefix}/bin
+libdir=$LIBDIR
+includedir=${prefix}/include/libsmpp34
+
+Name: libsmpp34
+Description: Open PDU SMPP packaging and unpackaging tool
+Version: $VERSION
+Requires:
+Libs: -lsmpp34
+Cflags: -I${includedir}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c16c64e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+#applied upstream: fixed_typo.patch
diff --git a/debian/rules b/debian/rules
index 4f472a7..fcf8621 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,43 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+#export DEB_BUILD_OPTIONS = parallel=1
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
+PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
+VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
 
-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')
 
 %:
-	dh $@ --with autoreconf --fail-missing
+	dh $@ --no-parallel --with autoreconf
+
+## Note! Workaround for the binary-dir present in the source dir -->
+.PHONY: binary
+binary:
+	dh $@
+## <--
+
+override_dh_auto_configure:
+	dh_auto_configure -- --includedir=/usr/include/libsmpp34
+	cat debian/libsmpp34.pc.in | sed 's/$$VERSION/${VER}/' | sed 's/$$PREFIX/\/usr/' \
+     | sed 's#$$LIBDIR#/usr/lib/$(DEB_HOST_MULTIARCH)#' > debian/libsmpp34.pc
+
+override_dh_auto_install:
+	dh_auto_install
+	install -D -m 644 debian/libsmpp34.pc debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libsmpp34.pc
+
 
-override_dh_strip:
-	dh_strip --dbg-package=libsmpp34-dbg
+override_dh_clean:
+	dh_clean
+	rm -f debian/libsmpp34.pc
 
-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)
+#get-orig-source: $(info I: $(PKG)_$(VER))
+#	@echo "# Downloading..."
+#	uscan --noconf --verbose --rename --destdir=$(CURDIR) --force-download --download-version $(VER) $(PKD)
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..eb7986d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=4
+opts="mode=git, dversionmangle=s/\+ds//" https://git.osmocom.org/libsmpp34 refs/tags/([\d\.]+) debian uupdate