[eris] 07/07: Update packaging

Olek Wojnar olek-guest at moszumanska.debian.org
Tue Jun 28 00:33:52 UTC 2016 

This is an automated email from the git hooks/post-receive script.

olek-guest pushed a commit to branch master
in repository eris.

commit 8df441fe9d28cdfe38d83c3dc097b13576207303
Author: Olek Wojnar <olek-dev at wojnar.org>
Date:   Sun Jun 26 14:42:58 2016 -0400

    Update packaging
---
 debian/changelog                     | 22 ++++++++++++++++------
 debian/control                       | 14 +++++++-------
 debian/copyright                     | 26 ++++++++++++++++++++++++--
 debian/docs                          |  1 -
 debian/liberis-doc.lintian-overrides |  3 +++
 debian/rules                         |  2 ++
 debian/triggers                      |  1 +
 7 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd70d2c..c984876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,22 @@
-eris (1.3.23-1) unstable; urgency=low
-
+eris (1.3.23-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #799749)
+  * Incorporate NMU, thanks Tobias Frost
+  * Update d/control
+    - Standards-Version to 3.9.8 (no changes)
+    - Remove pre-dependency on dpkg
+    - Update Vcs lines for secure URIs
   * Add myself as new uploader
-  * Incorporate and acknowledge NMU, thanks Tobias Frost
-  * New upstream release
-  * Update d/control: Standards-Version to 3.9.6 (no changes)
+    - Remove Stephen Webb per his request
+    - Thanks for all the contributions, Stephen!
+  * Update symbols
   * Convert to automatic debug package
+  * Enable all hardening options
+  * Update d/copyright
+  * Update lintian overrides
+  * Add ldconfig trigger
 
- -- Olek Wojnar <olek-dev at wojnar.org>  Sun, 26 Jun 2016 10:46:05 -0400
+ -- Olek Wojnar <olek-dev at wojnar.org>  Sun, 26 Jun 2016 16:55:55 -0400
 
 eris (1.3.21-0.1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ad548f7..bfae07f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,17 +11,18 @@ Build-Depends: debhelper (>= 9),
                libmercator-0.3-dev (>= 0.3.3),
                libsigc++-2.0-dev,
                libskstream-0.3-dev (>= 0.3.9),
-               libwfmath-1.0-dev
+               libwfmath-1.0-dev,
+               dpkg-dev (>= 1.16.1.1)
 Build-Conflicts: libsigc++-1.2-dev, libsigc-perl, libsigcoperl-dev
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://www.worldforge.org/
-Vcs-Git: git://anonscm.debian.org/pkg-games/eris.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-games/eris.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-games/eris.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/eris.git
 
 Package: liberis-1.3-21
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~)
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: WorldForge client entity library
  Eris is designed to simplify client development (and avoid repeating the
@@ -50,7 +51,7 @@ Description: WorldForge client entity library
 Package: liberis-1.3-dev
 Section: libdevel
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~)
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libatlas-cpp-0.6-dev (>= 0.6.3),
          liberis-1.3-21 (= ${binary:Version}),
          libglib2.0-dev,
@@ -87,7 +88,6 @@ Description: WorldForge client entity library - development files
 
 Package: liberis-doc
 Section: doc
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${misc:Depends}
 Suggests: liberis-1.3-dev
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 0c973ed..40ad3e1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: https://github.com/worldforge/eris
 Files: *
 Copyright: 2002-2008 James Turner <jmtn at blueyonder.co.uk>
            2003-2012 Alistair Riddoch <alriddoch at googlemail.com>
-           2012-2014 Erik Ogenvik <erik at ogenvik.org>
+           2008, 2010, 2012-2014 Erik Ogenvik (née Hjortsberg) <erik at ogenvik.org>
            2010 Manohar Vanga <manohar.vanga at gmail.com>
            2011, 2013, 2014 Peter Szücs <peter.szucs.dev at gmail.com>
            2002, 2003, 2005-2007 Simon Goodall <libwfut at simongoodall.co.uk>
@@ -15,10 +15,14 @@ Comment: The distribution license of this software is not explicitly clear
  correspondence that "I can just state the this code is distributed under the
  GPL version two."
 
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2006, 2007-2011 Free Software Foundation, Inc.
+License: GPL-2+
+
 Files: debian/*
 Copyright: 2002      Michael Koch <konqueror at gmx.de>
            2012-2013 Stephen M. Webb <stephen.webb at bregmasoft.ca>
-           2014 Olek Wojnar <olek-dev at wojnar.org>
+           2014-2016 Olek Wojnar <olek-dev at wojnar.org>
 License: GPL-2
 
 License: GPL-2
@@ -37,3 +41,21 @@ License: GPL-2
  .
  On Debian systems, the full text of the GNU General Public License version 2
  can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-2+
+ This program 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; either version 2 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 General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/docs b/debian/docs
index 5502ed8..50bd824 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,2 @@
 NEWS
 README
-TODO
diff --git a/debian/liberis-doc.lintian-overrides b/debian/liberis-doc.lintian-overrides
new file mode 100644
index 0000000..0ebad38
--- /dev/null
+++ b/debian/liberis-doc.lintian-overrides
@@ -0,0 +1,3 @@
+# Necessary for Doxygen documentation. For more information see:
+# http://sources.debian.net/src/doxygen/1.8.9.1-5/debian/README.jquery
+liberis-doc: embedded-javascript-library
diff --git a/debian/rules b/debian/rules
index 7e9b272..8d9268a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh $@ --parallel --with autoreconf
 
diff --git a/debian/triggers b/debian/triggers
new file mode 100644
index 0000000..dd86603
--- /dev/null
+++ b/debian/triggers
@@ -0,0 +1 @@
+activate-noawait ldconfig

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/eris.git

More information about the Pkg-games-commits mailing list