Integrate Debian packaging changes

debian/control:
    * restructure to make it easier to incorporate further changes
    * update package descriptions
    * update project URL

debian/rules:
    * use proper hardening syntax
    * remove useless comment

debian/compat: update compatibility version

debian/*.install: fix paths

debian/copyright: add file matching Debian format

Change-Id: I50b54d7d89f7c7ed3e5a10fbf734d967090f30c7
Related: OS#1694

6 files changed, 72 insertions, 22 deletions

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index b5fd656..e612a4f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,24 +1,50 @@
 Source: libsmpp34
+Maintainer: Holger Freyther <holger@moiji-mobile.com>
 Section: libs
 Priority: optional
-Maintainer: Holger Freyther <holger@moiji-mobile.com>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libxml2-dev, pkg-config
-Standards-Version: 3.9.3
-Homepage: http://bb.osmocom.org/trac/wiki/libosmocore
-Vcs-Git: git://git.osmocom.org/libosmocore.git
+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/gitweb?p=libosmocore.git;a=summary
+Vcs-Git: git://git.osmocom.org/libosmocore.git
+Homepage: https://projects.osmocom.org/projects/libsmpp34
 
 Package: libsmpp0
 Section: libs
 Architecture: any
-Depends: ${misc:Depends}
-Description: libsmpp34 codec library
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: Open PDU SMPP packaging and unpackaging tool
+ This library is an implementation for providing the PDU handling of the
+ SMPP-3.4 protocol. SMPP (Short Message Peer-to-Peer) is an open industry
+ standard protocol designed to provide a flexible data communication
+ interface for the transfer of short message data between External Short
+ Messaging Entities, Routing Entitites and Message Centres.
 
 Package: libsmpp34-dev
-Section: libdevel
 Architecture: any
-Depends: libsmpp0 (= ${binary:Version}), ${misc:Depends}
-Description: Development headers libsmpp34 codec library
+Multi-Arch: same
+Section: libdevel
+Depends: libsmpp0 (= ${binary:Version}),
+         ${misc:Depends}
+Description: Development files for libsmpp34
+ This library is an implementation for providing the PDU handling of the
+ SMPP-3.4 protocol. SMPP (Short Message Peer-to-Peer) is an open industry
+ standard protocol designed to provide a flexible data communication
+ interface for the transfer of short message data between External Short
+ Messaging Entities, Routing Entitites and Message Centres.
+ .
+ This package contains the development files for the library.
 
 Package: libsmpp34-utils
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..f92bc83
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,29 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: libsmpp34
+Source: http://c-open-smpp-34.sourceforge.net/
+
+Files: *
+Copyright: 2006 Raul Tremsal <ultraismo@yahoo.com>
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: 2016 Ruben Undheim <ruben.undheim@gmail.com>
+License: LGPL-2.1+
+
+
+License: LGPL-2.1+
+ This package 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 2.1 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 Lesser General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
diff --git a/debian/libsmpp0.install b/debian/libsmpp0.install
index b56f189..3ddde58 100644
--- a/debian/libsmpp0.install
+++ b/debian/libsmpp0.install
@@ -1 +1 @@
-usr/lib/libsmpp34.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libsmpp34-dev.install b/debian/libsmpp34-dev.install
index a6fcb65..91180f6 100644
--- a/debian/libsmpp34-dev.install
+++ b/debian/libsmpp34-dev.install
@@ -1,5 +1,5 @@
 usr/include/*
-usr/lib/*.so
-usr/lib/*.a
-usr/lib/lib*.la
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/*.a
+usr/lib/*/lib*.la
+usr/lib/*/pkgconfig/*
diff --git a/debian/rules b/debian/rules
index 7daafea..7b245b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,8 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@ --with autoreconf --fail-missing