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/copyright: update to match Debian format

Change-Id: Ia7f0a3a583ad63f5c6e5cf5e5de2ff7dd9eed8a9
Related: OS#1694

3 files changed, 89 insertions, 67 deletions

diff --git a/debian/control b/debian/control
index 588ce5a..9306656 100644
--- a/debian/control
+++ b/debian/control
@@ -1,31 +1,54 @@
 Source: openggsn
+Maintainer: Harald Welte <laforge@gnumonks.org>
 Section: net
 Priority: optional
-Maintainer: Harald Welte <laforge@gnumonks.org>
-Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, libdpkg-perl, git, dh-autoreconf, libosmocore-dev (>= 0.8.0)
+Build-Depends: debhelper (>= 9),
+               autotools-dev,
+               pkg-config,
+               libdpkg-perl, git,
+               dh-autoreconf,
+               libosmocore-dev (>= 0.8.0)
 Standards-Version: 3.9.6
-Homepage: http://sourceforge.net/projects/ggsn/
-Vcs-Git: git://ggsn.git.sourceforge.net/gitroot/ggsn/ggsn
 Vcs-Browser: http://ggsn.git.sourceforge.net/git/gitweb.cgi?p=ggsn/ggsn;a=summary
+Vcs-Git: git://ggsn.git.sourceforge.net/gitroot/ggsn/ggsn
+Homepage: https://projects.osmocom.org/projects/openggsn
 
 Package: openggsn
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Gateway GPRS Support Node
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Gateway GPRS Support Node (GGSN)
+ OpenGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile
+ operators as the interface between the Internet and the rest of the
+ mobile network infrastructure.
 
 Package: libgtp0
 Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: library implementing the GTP protocol between SGSN and GGSN
+ OpenGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile
+ operators as the interface between the Internet and the rest of the
+ mobile network infrastructure.
+ .
+ This library is part of openggsn and implements the GTP protocol between
+ SGSN (Serving GPRS support node) and GGSN.
 
 Package: libgtp0-dev
-Depends: ${misc:Depends}, libgtp0 (= ${binary:Version})
-Multi-Arch: same
 Architecture: any
+Multi-Arch: same
 Section: libdevel
+Depends: ${misc:Depends},
+         libgtp0 (= ${binary:Version})
 Description: Development files for libgtp
+ OpenGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile
+ operators as the interface between the Internet and the rest of the
+ mobile network infrastructure.
+ .
+ The library libgtp implements the GTP protocol between SGSN and GGSN
+ and this package contains the development files for this library.
 
 Package: openggsn-dbg
 Section: debug
diff --git a/debian/copyright b/debian/copyright
index c5d2af9..b3339d9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,46 +1,55 @@
-This work was packaged for Debian by:
-
-    Harald Welte <laforge@gnumonks.org> on Tue, 24 Aug 2010 11:23:40 +0200
-
-It was downloaded from:
-
-    http://sourceforge.net/projects/ggsn
-
-Upstream Author(s):
-
-    Jens Jakobsen <jj@openggsn.org>
-    Harald Welte <laforge@gnumonks.org>
-
-Copyright:
-
-    Copyright (C) 2002 Mondru AB
-    Copyright (C) 2010 Harald Welte <laforge@gnumonks.org>
-
-License:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
-
-    This package 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 General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Harald Welte <laforge@gnumonks.org>
-
-you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: openggsn
+Source: http://sourceforge.net/projects/ggsn/
+
+Files: *
+Copyright: 2002      Jens Jakobsen <jj@openggsn.org>
+           2002-2004 Mondru AB
+           2010-2011 Harald Welte <laforge@gnumonks.org>
+License: GPL-2
+
+Files: lib/getopt.c
+       lib/gnugetopt.h
+       lib/getopt1.c
+Copyright: 1987-2001 Free Software Foundation, Inc.
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: 2010-2015  Harald Welte <laforge@gnumonks.org>
+           2016       Ruben Undheim <ruben.undheim@gmail.com>
+License: GPL-2
+
+
+License: GPL-2
+ This package is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License
+ .
+ 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 General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+
+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/rules b/debian/rules
index 62f5236..5562909 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,11 @@
 #!/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.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
 #export DH_OPTIONS
-export DEB_BUILD_HARDENING=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@ --with autoreconf