This is an automated email from the git hooks/post-receive script. olek-guest pushed a commit to branch master in repository eris.
commit d96e3d0fe33aa67b446b330ed36616d85f3e28ab Author: Olek Wojnar <[email protected]> Date: Mon Oct 20 17:44:13 2014 -0500 Update packaging for new release --- debian/changelog | 9 +++++++++ debian/control | 22 +++++++++++----------- debian/copyright | 9 +++++++-- debian/liberis-1.3-20.install | 2 -- debian/liberis-1.3-21.install | 2 ++ ...beris-1.3-20.symbols => liberis-1.3-21.symbols} | 2 +- debian/patches/01-disable-silent-rules.patch | 6 +++--- debian/rules | 8 ++------ debian/watch | 2 +- 9 files changed, 36 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index f3472e0..8ad7461 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +eris (1.3.23-1) unstable; urgency=low + + * 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) + + -- Olek Wojnar <[email protected]> Mon, 20 Oct 2014 17:14:18 -0500 + eris (1.3.21-0.1) unstable; urgency=low [ Tobias Frost ] diff --git a/debian/control b/debian/control index 68f3017..97c3879 100644 --- a/debian/control +++ b/debian/control @@ -2,23 +2,23 @@ Source: eris Section: libs Priority: optional Maintainer: Debian Games Team <[email protected]> -Uploaders: Stephen M. Webb <[email protected]> +Uploaders: Olek Wojnar <[email protected]> Build-Depends: debhelper (>= 9), dh-autoreconf, doxygen, - libatlas-cpp-0.6-dev (>= 0.6.2), + libatlas-cpp-0.6-dev (>= 0.6.3), libglib2.0-dev, - libmercator-0.3-dev (>= 0.3.2), + libmercator-0.3-dev (>= 0.3.3), libsigc++-2.0-dev, libskstream-0.3-dev (>= 0.3.9), libwfmath-1.0-dev Build-Conflicts: libsigc++-1.2-dev, libsigc-perl, libsigcoperl-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Homepage: http://www.worldforge.org/ Vcs-Git: git://anonscm.debian.org/pkg-games/eris.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/eris.git +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-games/eris.git -Package: liberis-1.3-20 +Package: liberis-1.3-21 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~) @@ -51,11 +51,11 @@ Package: liberis-1.3-dev Section: libdevel Architecture: any Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~) -Depends: libatlas-cpp-0.6-dev (>= 0.6.2), - liberis-1.3-20 (= ${binary:Version}), +Depends: libatlas-cpp-0.6-dev (>= 0.6.3), + liberis-1.3-21 (= ${binary:Version}), libglib2.0-dev, libsigc++-2.0-dev, - libskstream-0.3-dev (>= 0.3.8), + libskstream-0.3-dev (>= 0.3.9), libwfmath-1.0-dev, ${misc:Depends} Description: WorldForge client entity library - development files @@ -85,13 +85,13 @@ Description: WorldForge client entity library - development files This package contains the development files for compiling software depending on Eris. -Package: liberis-1.3-20-dbg +Package: liberis-1.3-21-dbg Section: debug Architecture: any Multi-Arch: same Priority: extra Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~) -Depends: liberis-1.3-20 (= ${binary:Version}), ${misc:Depends} +Depends: liberis-1.3-21 (= ${binary:Version}), ${misc:Depends} Description: WorldForge client entity library - debugging library Eris is designed to simplify client development (and avoid repeating the same work several times), by providing a common system to deal with the diff --git a/debian/copyright b/debian/copyright index c98335d..0c973ed 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,8 +3,12 @@ Source: https://github.com/worldforge/eris Files: * Copyright: 2002-2008 James Turner <[email protected]> - 2003-2011 Alistair Riddoch <[email protected]> - 2012 Erik Ogenvik <[email protected]> + 2003-2012 Alistair Riddoch <[email protected]> + 2012-2014 Erik Ogenvik <[email protected]> + 2010 Manohar Vanga <[email protected]> + 2011, 2013, 2014 Peter Szücs <[email protected]> + 2002, 2003, 2005-2007 Simon Goodall <[email protected]> + 2008-2009 Alexey Torkhov <[email protected]> License: GPL-2 Comment: The distribution license of this software is not explicitly clear in the upstream tarball. Alistair Riddoch has additionally clarified in personal @@ -14,6 +18,7 @@ Comment: The distribution license of this software is not explicitly clear Files: debian/* Copyright: 2002 Michael Koch <[email protected]> 2012-2013 Stephen M. Webb <[email protected]> + 2014 Olek Wojnar <[email protected]> License: GPL-2 License: GPL-2 diff --git a/debian/liberis-1.3-20.install b/debian/liberis-1.3-20.install deleted file mode 100644 index 64caf76..0000000 --- a/debian/liberis-1.3-20.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*/liberis-1.3.so.20 -usr/lib/*/liberis-1.3.so.20.* diff --git a/debian/liberis-1.3-21.install b/debian/liberis-1.3-21.install new file mode 100644 index 0000000..180f713 --- /dev/null +++ b/debian/liberis-1.3-21.install @@ -0,0 +1,2 @@ +usr/lib/*/liberis-1.3.so.21 +usr/lib/*/liberis-1.3.so.21.* diff --git a/debian/liberis-1.3-20.symbols b/debian/liberis-1.3-21.symbols similarity index 99% rename from debian/liberis-1.3-20.symbols rename to debian/liberis-1.3-21.symbols index 4d75ddf..e1a45cd 100644 --- a/debian/liberis-1.3-20.symbols +++ b/debian/liberis-1.3-21.symbols @@ -1,4 +1,4 @@ -liberis-1.3.so.20 liberis-1.3-20 #MINVER# +liberis-1.3.so.21 liberis-1.3-21 #MINVER# _ZN4Eris10Connection10disconnectEv@Base 1.3.19 _ZN4Eris10Connection10dispatchOpERKN5Atlas7Objects8SmartPtrINS2_9Operation17RootOperationDataEEE@Base 1.3.19 _ZN4Eris10Connection13handleFailureERKSs@Base 1.3.19 diff --git a/debian/patches/01-disable-silent-rules.patch b/debian/patches/01-disable-silent-rules.patch index 58e0475..df38df0 100644 --- a/debian/patches/01-disable-silent-rules.patch +++ b/debian/patches/01-disable-silent-rules.patch @@ -1,11 +1,11 @@ Description: Patch autoconf to use non-silent rules -Author: Tobias Frost <[email protected]> +Author: Tobias Frost <[email protected]> Forwarded: not-needed --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/configure.ac +++ b/configure.ac -@@ -11,8 +11,8 @@ +@@ -13,8 +13,8 @@ dnl Automake setup @@ -15,4 +15,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +#AM_SILENT_RULES([yes]) dnl versioning info for libtool - ERIS_CURRENT=20 + ERIS_CURRENT=21 diff --git a/debian/rules b/debian/rules index 80fd8e6..7aeb444 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,14 @@ #!/usr/bin/make -f %: - dh $@ --with autoreconf + dh $@ --parallel --with autoreconf override_dh_auto_clean: rm -rf docs dh_auto_clean override_dh_auto_build-indep: - $(MAKE) doc + $(MAKE) docs override_dh_install: dh_install --fail-missing -X.la -X.a @@ -19,7 +19,3 @@ override_dh_strip: dh_strip -p$${pkg} --dbg-package=$${pkg}-dbg; \ done dh_strip -s --remaining-packages - -override_dh_builddeb: - dh_builddeb -- -Zxz - diff --git a/debian/watch b/debian/watch index 715336d..71272bc 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://sf.net/worldforge/eris-([\d.]+)\.tar\.bz2 debian +http://sf.net/worldforge/eris-([\d\.]+)\.(?:tar\.(?:gz|bz2|xz)) debian uupdate -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/eris.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
