Preapproving wormux 0.8-2 upload (is this ok for migration?)
Hello debian-release,
I and Cyril Brulebois, as part of the DGT, made some changes to the wormux package which mainly
consist of the following:
Changes:
wormux (1:0.8-2) UNRELEASED; urgency=low
.
[ Cyril Brulebois ]
* debian/control.in:
- Fix grammar in the short description of the wormux-data package.
* debian/control:
- Refresh accordingly.
* debian/watch:
- Use upstream version mangling to replace “beta” with “~beta”, which
should help sorting new upstream beta versions correctly.
.
[ Eddy Petrișor ]
* moved to git for maintenance and changed Vcs-* fields accordingly
* imported the refresh-patches mechanism from tokyocabinet's package;
thanks MadCoder
* added simplepatchsys for patch management
* Updated copyright information:
- Added more of the upstream authors
- cleared up debian/* license, thanks to all co-maintainers
* imported some patches from upstream that fix important or RC bugs:
- fix for a crash in the chat code when clearing the text
- fix a segfault when the sound device wasn't available
- do not load the index server needlessly with unaccessible games
* update standards version to 3.8.0:
- wrapped the Uploaders field
- added debian/README.source, as recommended in debian-policy 4.14
The debdiff between the official 0.8-1 and the pending 0.8-2 is attached (ignore 'UNRELEASED', it
will be fixed).
Is such a change ok for upload and, if proven stable, migration to lenny? If not, which part is
unacceptable?
I am asking to avoid useless work/uploads, etc.
TIA
--
Regards,
EddyP
=============================================
"Imagination is more important than knowledge" A.Einstein
diff -u wormux-0.8/debian/control.in wormux-0.8/debian/control.in
--- wormux-0.8/debian/control.in
+++ wormux-0.8/debian/control.in
@@ -2,12 +2,16 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
-Uploaders: Jean Parpaillon (artefact) <artefact@altern.org>, Eddy PetriÈ?or <eddy.petrisor@gmail.com>, Cyril Brulebois <kibi@debian.org>, Sam Hocevar (Debian packages) <sam+deb@zoy.org>, Gerfried Fuchs <rhonda@debian.at>
+Uploaders: Jean Parpaillon (artefact) <artefact@altern.org>,
+ Eddy PetriÈ?or <eddy.petrisor@gmail.com>,
+ Cyril Brulebois <kibi@debian.org>,
+ Sam Hocevar (Debian packages) <sam+deb@zoy.org>,
+ Gerfried Fuchs <rhonda@debian.at>
Build-Depends: @cdbs@, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl-gfx1.2-dev (>= 2.0.13), libxml++2.6-dev, libcurl4-gnutls-dev, fontconfig, ttf-dejavu, dpkg-dev (>= 1.13.19)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://wormux.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/wormux/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/wormux/?op=log
+Vcs-Git: git://git.debian.org/git/pkg-games/wormux/
+Vcs-Browser: http://git.debian.org/?p=pkg-games/wormux.git;a=summary
Package: wormux
Architecture: any
@@ -31,7 +35,7 @@
Depends: ttf-dejavu
Recommends: wormux (>= ${source:Version})
Conflicts: wormux (<< 0.8beta2-1)
-Description: data files for the game wormux
+Description: data files for the wormux game
Wormux is a free game where funny animals fight on a 2D map with
funny weapons. Though currently under heavy development, it is
already very playable, with lots of weapons (Dynamite, Baseball Bat,
diff -u wormux-0.8/debian/rules wormux-0.8/debian/rules
--- wormux-0.8/debian/rules
+++ wormux-0.8/debian/rules
@@ -3,11 +3,39 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
FONT_PATH = $(shell fc-match --verbose 'DejaVu Sans' | grep 'file:' | sed -e 's/.*file: "\(.*\)"(s)/\1/')
DEB_CONFIGURE_EXTRA_FLAGS += --bindir=\$${prefix}/games --with-datadir-name=\$${prefix}/share/games/wormux --with-localedir-name=\$${prefix}/share/locale --with-font-path=$(FONT_PATH)
DEB_DH_INSTALL_SOURCEDIR = debian/tmp
+srcpkg = $(shell dpkg-parsechangelog | sed -ne 's/Source: *//p')
+srcver = $(shell dpkg-parsechangelog | sed -ne 's/Version: *\(.*:\)\?\(.*\)-.*$$/\2/p')
+
+#{{{ generic rules
+
+../$(srcpkg)_$(srcver).orig.tar.gz:
+ @if git rev-parse --git-dir >/dev/null 2>&1; then \
+ pristine-tar checkout $@; \
+ fi
+
+check-tarball: ../$(srcpkg)_$(srcver).orig.tar.gz
+
+.PHONY: check-tarball
+
+#}}}
+#{{{ maintainer stuff
+
+refresh-patches: check-tarball
+ @dh_testdir
+ @echo 'refreshing debian/patches:'
+ @rm -rf '$(CURDIR)'/debian/patches
+ @mkdir -p '$(CURDIR)'/debian/patches
+ @cd '$(CURDIR)'/debian/patches && git format-patch upstream..upstream+patches
+ @echo .
+
+#}}}
+
install/wormux::
mkdir -p debian/tmp/usr/share/pixmaps
cp debian/wormux_*.xpm debian/tmp/usr/share/pixmaps
diff -u wormux-0.8/debian/changelog wormux-0.8/debian/changelog
--- wormux-0.8/debian/changelog
+++ wormux-0.8/debian/changelog
@@ -1,3 +1,32 @@
+wormux (1:0.8-2) UNRELEASED; urgency=low
+
+ [ Cyril Brulebois ]
+ * debian/control.in:
+ - Fix grammar in the short description of the wormux-data package.
+ * debian/control:
+ - Refresh accordingly.
+ * debian/watch:
+ - Use upstream version mangling to replace â??betaâ?? with â??~betaâ??, which
+ should help sorting new upstream beta versions correctly.
+
+ [ Eddy PetriÈ?or ]
+ * moved to git for maintenance and changed Vcs-* fields accordingly
+ * imported the refresh-patches mechanism from tokyocabinet's package;
+ thanks MadCoder
+ * added simplepatchsys for patch management
+ * Updated copyright information:
+ - Added more of the upstream authors
+ - cleared up debian/* license, thanks to all co-maintainers
+ * imported some patches from upstream that fix important or RC bugs:
+ - fix for a crash in the chat code when clearing the text
+ - fix a segfault when the sound device wasn't available
+ - do not load the index server needlessly with unaccessible games
+ * update standards version to 3.8.0:
+ - wrapped the Uploaders field
+ - added debian/README.source, as recommended in debian-policy 4.14
+
+ -- Eddy PetriÈ?or <eddy.petrisor@gmail.com> Tue, 26 Aug 2008 11:14:16 +0300
+
wormux (1:0.8-1) unstable; urgency=low
* New upstream release.
diff -u wormux-0.8/debian/copyright wormux-0.8/debian/copyright
--- wormux-0.8/debian/copyright
+++ wormux-0.8/debian/copyright
@@ -1,15 +1,31 @@
This package was debianized by Jean Parpaillon <jean.parpaillon@free.fr> on
Mon, 9 Jan 2006 14:21:55 +0100.
+
+The refresh-patches mechanism is BSD licensed (taken from tokyocabinet's package)
+and is © 2007 Pierre Habouzit <madcoder@debian.org>
+License: BSD
+ On Debian systems the text of the license can be found at:
+ /usr/share/common-licenses/BSB
+
+
It was downloaded from http://wormux.org/
-Copyright Holder (2001-2008):
+Copyright (2001-2008):
+Anthony CARRÃ? <yeknan_AT_yahoo_DOT_fr>
+Jaka KRANJC <svn_AT_lynxlynx_DOT_info>
Jean-Christophe DUBERGA <jcduberga@gmx.de>
+Kurosu <kurosu_AT_free_DOT_fr>
Laurent DEFERT SIMONNEAU <lodesi2@yahoo.fr>
Lawrence AZZOUG <lawrenceazzoug@wanadoo.fr>
Matthieu FERTRÃ? <matthieu.fertre@free.fr>
+Olivier SERRES <olivier.serres_AT_gmail_DOT_com>
+Reiner HERRMANN <reiner_AT_reiner-h_DOT_de>
Renaud LOTTIAUX <renaud.lottiaux@free.fr>
+Sébastien GONZALVE <oznog_AT_zarb_DOT_org>
Victor STINNER <victor.stinner@haypocalc.com>
+Yannig PERRÃ? <yannig.perre_AT_gmail_DOT_com>
+and Wormux contributors.
License:
diff -u wormux-0.8/debian/watch wormux-0.8/debian/watch
--- wormux-0.8/debian/watch
+++ wormux-0.8/debian/watch
@@ -3,2 +3,3 @@
+opts="uversionmangle=s/beta/~beta/" \
http://download.gna.org/wormux/wormux-(\d[\d\.a-z]+)\.tar\.(?:bz2|gz)
diff -u wormux-0.8/debian/control wormux-0.8/debian/control
--- wormux-0.8/debian/control
+++ wormux-0.8/debian/control
@@ -2,12 +2,16 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
-Uploaders: Jean Parpaillon (artefact) <artefact@altern.org>, Eddy PetriÈ?or <eddy.petrisor@gmail.com>, Cyril Brulebois <kibi@debian.org>, Sam Hocevar (Debian packages) <sam+deb@zoy.org>, Gerfried Fuchs <rhonda@debian.at>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, gnulib (>= 0.0.20041014-2), debhelper (>= 5), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl-gfx1.2-dev (>= 2.0.13), libxml++2.6-dev, libcurl4-gnutls-dev, fontconfig, ttf-dejavu, dpkg-dev (>= 1.13.19)
-Standards-Version: 3.7.3
+Uploaders: Jean Parpaillon (artefact) <artefact@altern.org>,
+ Eddy PetriÈ?or <eddy.petrisor@gmail.com>,
+ Cyril Brulebois <kibi@debian.org>,
+ Sam Hocevar (Debian packages) <sam+deb@zoy.org>,
+ Gerfried Fuchs <rhonda@debian.at>
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, gnulib (>= 0.0.20041014-2), debhelper (>= 5), patchutils (>= 0.2.25), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl-gfx1.2-dev (>= 2.0.13), libxml++2.6-dev, libcurl4-gnutls-dev, fontconfig, ttf-dejavu, dpkg-dev (>= 1.13.19)
+Standards-Version: 3.8.0
Homepage: http://wormux.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/wormux/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/wormux/?op=log
+Vcs-Git: git://git.debian.org/git/pkg-games/wormux/
+Vcs-Browser: http://git.debian.org/?p=pkg-games/wormux.git;a=summary
Package: wormux
Architecture: any
@@ -31,7 +35,7 @@
Depends: ttf-dejavu
Recommends: wormux (>= ${source:Version})
Conflicts: wormux (<< 0.8beta2-1)
-Description: data files for the game wormux
+Description: data files for the wormux game
Wormux is a free game where funny animals fight on a 2D map with
funny weapons. Though currently under heavy development, it is
already very playable, with lots of weapons (Dynamite, Baseball Bat,
only in patch2:
unchanged:
--- wormux-0.8.orig/debian/README.source
+++ wormux-0.8/debian/README.source
@@ -0,0 +1,30 @@
+Task: apply debian patches
+Tools: make, cdbs, patchutils
+Command: debian/rules patch
+Description: For patch apply/deapply we use the Simple Patch System from CDBS
+ Please read /usr/share/doc/cdbs/cdbs-doc.pdf.gz chapter 4.1 'Patching
+ Sources Using the Simple Patch System' for information how to use
+ simplepatchsys for managing Debian patches
+
+Task: add a new debian patch
+Tools: make, cdbs, patchutils, diff
+Command: cp 9999--your-level-0-1-or-2-patch.patch debian/patches/
+Description: Supplemental patches can be added to the package's if simply
+ copied in the debian/patches directory. Files should be named so as to
+ reflect in which order they have to be applied, and must end in a .patch
+ or .diff suffix.
+
+Task: remove debian patches
+Tools: rm
+Command: rm debian/patches/*
+Description: Remove source modifications that are currently being applied
+ when building the package.
+
+
+Task: converting upstream tarball
+Tools: bzcat, gzip
+Command: bzcat wormux-0.8.tar.bz2 | gzip --best -c > wormux_0.5.orig.tar.gz
+Description: As Upstream only provides bz2 compresssed tarballs we must
+ uncompress and recompress them to get gzip Format as is needed by the debian
+ archives
+
only in patch2:
unchanged:
--- wormux-0.8.orig/debian/patches/0003--BUGFIX-Disconnect-server-from-index-server-as-soon.patch
+++ wormux-0.8/debian/patches/0003--BUGFIX-Disconnect-server-from-index-server-as-soon.patch
@@ -0,0 +1,28 @@
+From 49b0e19c7ce4cb9693b01b4ced172981756deced Mon Sep 17 00:00:00 2001
+From: gentildemon <gentildemon@30ef787d-52ff-0310-b286-e08351bb7647>
+Date: Fri, 11 Jul 2008 09:18:32 +0000
+Subject: [PATCH] [BUGFIX] Disconnect server from index server as soon as we start the game (players can't join a running game)
+
+git-svn-id: svn+ssh://svn.gna.org/svn/wormux/trunk@4704 30ef787d-52ff-0310-b286-e08351bb7647
+---
+ src/menu/network_menu.cpp | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/menu/network_menu.cpp b/src/menu/network_menu.cpp
+index d95da61..0a43807 100644
+--- a/src/menu/network_menu.cpp
++++ b/src/menu/network_menu.cpp
+@@ -266,6 +266,10 @@ bool NetworkMenu::signal_ok()
+ // Starting the game :-)
+ SaveOptions();
+ play_ok_sound();
++
++ if (Network::GetInstance()->IsServer())
++ IndexServer::GetInstance()->Disconnect();
++
+ Game::GetInstance()->Start();
+ Network::GetInstance()->network_menu = NULL;
+ }
+--
+1.5.6.3
+
only in patch2:
unchanged:
--- wormux-0.8.orig/debian/patches/0001--bug-11741-Chat-s-and-backspace-pressed-quickly-c.patch
+++ wormux-0.8/debian/patches/0001--bug-11741-Chat-s-and-backspace-pressed-quickly-c.patch
@@ -0,0 +1,27 @@
+From c0448e6fb84e5549e19dcbd69159c99119c0f7ee Mon Sep 17 00:00:00 2001
+From: gentildemon <gentildemon@30ef787d-52ff-0310-b286-e08351bb7647>
+Date: Thu, 29 May 2008 20:27:49 +0000
+Subject: [PATCH] [bug #11741] Chat: s and backspace pressed quickly crash the game
+
+The cursor position was not reseted when clearing the text
+
+git-svn-id: svn+ssh://svn.gna.org/svn/wormux/trunk@4544 30ef787d-52ff-0310-b286-e08351bb7647
+---
+ src/network/chat.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/network/chat.cpp b/src/network/chat.cpp
+index 1edee07..e65c3ac 100644
+--- a/src/network/chat.cpp
++++ b/src/network/chat.cpp
+@@ -123,6 +123,7 @@ void Chat::HandleKey(const SDL_Event& event)
+ if (txt != "" )
+ Network::GetInstance()->SendChatMessage(txt); //Send 'txt' to other players
+ input->Set("");
++ cursor_pos = 0;
+ break;
+
+ default:
+--
+1.5.6.3
+
only in patch2:
unchanged:
--- wormux-0.8.orig/debian/patches/0002--bug-11754-Fix-segfault-if-sound-device-is-not-ava.patch
+++ wormux-0.8/debian/patches/0002--bug-11754-Fix-segfault-if-sound-device-is-not-ava.patch
@@ -0,0 +1,63 @@
+From 600d0ef3a326733acba8197c9868b5e4681a72bd Mon Sep 17 00:00:00 2001
+From: gentildemon <gentildemon@30ef787d-52ff-0310-b286-e08351bb7647>
+Date: Thu, 29 May 2008 21:00:36 +0000
+Subject: [PATCH] [bug #11754] Fix segfault if sound device is not available
+
+git-svn-id: svn+ssh://svn.gna.org/svn/wormux/trunk@4546 30ef787d-52ff-0310-b286-e08351bb7647
+---
+ src/sound/jukebox.cpp | 12 ++++++++++--
+ 1 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/sound/jukebox.cpp b/src/sound/jukebox.cpp
+index 0f63ced..d76b171 100644
+--- a/src/sound/jukebox.cpp
++++ b/src/sound/jukebox.cpp
+@@ -154,6 +154,9 @@ void JukeBox::ActiveMusic (bool on)
+
+ void JukeBox::LoadMusicXML()
+ {
++ if (!m_init) // the sound device has not be initialized (was busy?)
++ return;
++
+ // is xml_file already loaded ?
+ std::set<std::string>::iterator it_profile = m_profiles_loaded.find("music") ;
+ if (it_profile != m_profiles_loaded.end())
+@@ -327,6 +330,9 @@ bool JukeBox::PlayMusicSample(const std::vector<std::string>::const_iterator& fi
+
+ void JukeBox::LoadXML(const std::string& profile)
+ {
++ if (!m_init) // the sound device has not be initialized (was busy?)
++ return;
++
+ // is xml_file already loaded ?
+ std::set<std::string>::iterator it_profile = m_profiles_loaded.find(profile);
+ if (it_profile != m_profiles_loaded.end())
+@@ -390,7 +396,7 @@ void JukeBox::LoadXML(const std::string& profile)
+ int JukeBox::Play (const std::string& category, const std::string& sample,
+ const int loop)
+ {
+- if (!UseEffects()) return -1;
++ if (!UseEffects() || !m_init) return -1;
+
+ uint nb_sons= m_soundsamples.count(category+"/"+sample);
+ if (nb_sons)
+@@ -429,13 +435,15 @@ int JukeBox::Play (const std::string& category, const std::string& sample,
+
+ int JukeBox::Stop (int channel) const
+ {
+- if(!m_config.music && !m_config.effects) return 0;
++ if (!m_init) return 0;
++ if (!m_config.music && !m_config.effects) return 0;
+ if (channel == -1) return 0;
+ return Mix_HaltChannel(channel);
+ }
+
+ int JukeBox::StopAll() const
+ {
++ if (!m_init) return 0;
+ if (!m_config.music && !m_config.effects) return 0;
+
+ // halt playback on all channels
+--
+1.5.6.3
+
Reply to: