[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit fac2a3b4c54d06bafaef61e27211be9790f44827
Merge: 768b7750b9d41d6df34790c66d4c3d04258cb748 
000ab787a7e1af0d013745135ff64556bde3c8a8
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Mon Aug 18 14:43:52 2008 +0300

Merge commit 'upstream/0.8' into debian/0.8-1


-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit e1f5e4c5bea2f57a7699f0e2fdb0da694cbaf027
Merge: fac2a3b4c54d06bafaef61e27211be9790f44827 
4108a5ac64d1217e97efb0ec0da47f14f98f2438
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Mon Aug 18 22:23:53 2008 +0300

Merge commit 'pkgsvn/master'


-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 12906aa637c61c0e5fe55b15d1f9ed330c55e5ba
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Aug 19 10:22:39 2008 +0300

correct the changelog for 1:0.8-1 to match the official changelog

diff --git a/debian/changelog b/debian/changelog
index ae0f65c..cb7bfc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 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.
 
- -- Cyril Brulebois k...@debian.org  Tue, 20 May 2008 20:55:09 +0200
+ -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 19 Aug 2008 10:21:10 +0300
 
 wormux (1:0.8-1) unstable; urgency=low
 
@@ -24,9 +28,6 @@ wormux (1:0.8-1) unstable; urgency=low
  - Update my mail address.
   * debian/control:
  - Refresh accordingly, using the “update_control” target.
-  * debian/watch:
- - Use upstream version mangling to replace “beta” with “~beta”, which
-   should help sorting new upstream beta versions correctly.
 
  -- Cyril Brulebois k...@debian.org  Tue, 20 May 2008 19:37:34 +0200
 

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit de7c03c6c5ca1960009279ae1a989418eb55f603
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Fri Aug 22 02:43:18 2008 +0300

moved to git for maintainance and changed Vcs-* fields accordingly

diff --git a/debian/changelog b/debian/changelog
index cb7bfc3..40fc092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ wormux (1:0.8-2) UNRELEASED; urgency=low
  - Use upstream version mangling to replace “beta” with “~beta”, which
should help sorting new upstream beta versions correctly.
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 19 Aug 2008 10:21:10 +0300
+  [ Eddy Petrișor ]
+  * moved to git for maintainance and changed Vcs-* fields accordingly
+
+ -- Eddy Petrișor eddy.petri...@gmail.com  Fri, 22 Aug 2008 02:42:48 +0300
 
 wormux (1:0.8-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b16d764..5ff2cb8 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Jean Parpaillon (artefact) artef...@altern.org, 
Eddy Petrișor edd
 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
 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

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 5b5c49d665a0d2c717213d8546041f070c87d0df
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Mon Aug 25 08:11:23 2008 +0300

also update the Vcs-* field in the control.in file

diff --git a/debian/control.in b/debian/control.in
index 96fc527..c8b8789 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,8 +6,8 @@ Uploaders: Jean Parpaillon (artefact) artef...@altern.org, 
Eddy Petrișor edd
 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
 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

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 88f985d11d6e9bd0e01d45458743b6a39ceb07ef
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Sun Aug 24 12:26:38 2008 +0300

imported the refresh-patches mechanism from tokyocabinet's package

diff --git a/debian/changelog b/debian/changelog
index 40fc092..f4cdbfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ wormux (1:0.8-2) UNRELEASED; urgency=low
 
   [ Eddy Petrișor ]
   * moved to git for maintainance and changed Vcs-* fields accordingly
+  * imported the refresh-patches mechanism from tokyocabinet's package;
+thanks MadCoder
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Fri, 22 Aug 2008 02:42:48 +0300
+ -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 23 Aug 2008 12:48:38 +0300
 
 wormux (1:0.8-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 0a0d092..17ed7a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,14 @@
 This package was debianized by Jean Parpaillon jean.parpail...@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 madco...@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):
@@ -11,6 +19,7 @@ Matthieu FERTRÉ matthieu.fer...@free.fr
 Renaud LOTTIAUX renaud.lotti...@free.fr
 Victor STINNER victor.stin...@haypocalc.com
 
+
 License:
 
This package is free software; you can redistribute it and/or modify
diff --git a/debian/rules b/debian/rules
index 61dd350..119883a 100755
--- a/debian/rules
+++ b/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 21; 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

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit f3e184f6aa31128c6e116881306868101be6370b
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Aug 26 11:38:14 2008 +0300

updated ustream copyright information

diff --git a/debian/changelog b/debian/changelog
index f4cdbfe..5978fe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ wormux (1:0.8-2) UNRELEASED; urgency=low
   * moved to git for maintainance and changed Vcs-* fields accordingly
   * imported the refresh-patches mechanism from tokyocabinet's package;
 thanks MadCoder
+  * Updated copyright information:
+- Added more of the upstream authors
 
  -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 23 Aug 2008 12:48:38 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 17ed7a5..73154c8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,14 +11,21 @@ License: BSD
 
 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 jcdube...@gmx.de
+Kurosu kurosu_AT_free_DOT_fr
 Laurent DEFERT SIMONNEAU lode...@yahoo.fr
 Lawrence AZZOUG lawrenceazz...@wanadoo.fr
 Matthieu FERTRÉ matthieu.fer...@free.fr
+Olivier SERRES olivier.serres_AT_gmail_DOT_com
+Reiner HERRMANN reiner_AT_reiner-h_DOT_de
 Renaud LOTTIAUX renaud.lotti...@free.fr
+Sébastien GONZALVE oznog_AT_zarb_DOT_org
 Victor STINNER victor.stin...@haypocalc.com
-
+Yannig PERRÉ yannig.perre_AT_gmail_DOT_com
+and Wormux contributors.
 
 License:
 

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 2f14b8a0f6f59637689684921bae87ac5ffdfe73
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Sun Aug 24 12:30:02 2008 +0300

added some patches from upstream trunk

* added simplepatchsys for patch management
  - re-ran a debian/rules update_control
* imported some patches from upstream that fix important or RC bugs:
  - fix for a crash in the chat code when clearing the text
(some whitespace changes were pruned)
  - fix a segfault when the sound device wasn't available
  - do not load the index server needlessly with unaccessible games

diff --git a/debian/changelog b/debian/changelog
index 5978fe1..48524f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,10 +13,16 @@ wormux (1:0.8-2) UNRELEASED; urgency=low
   * moved to git for maintainance 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
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 23 Aug 2008 12:48:38 +0300
+ -- Eddy Petrișor eddy.petri...@gmail.com  Sun, 24 Aug 2008 12:04:02 +0300
 
 wormux (1:0.8-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5ff2cb8..b07364e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Jean Parpaillon (artefact) artef...@altern.org, Eddy Petrișor 
eddy.petri...@gmail.com, Cyril Brulebois k...@debian.org, Sam Hocevar 
(Debian packages) sam+...@zoy.org, Gerfried Fuchs rho...@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)
+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.7.3
 Homepage: http://wormux.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/wormux/
diff --git 
a/debian/patches/0001--bug-11741-Chat-s-and-backspace-pressed-quickly-c.patch 
b/debian/patches/0001--bug-11741-Chat-s-and-backspace-pressed-quickly-c.patch
new file mode 100644
index 000..12c7a65
--- /dev/null
+++ 
b/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 gentilde...@30ef787d-52ff-0310-b286-e08351bb7647
+Date: Thu, 29 May 2008 20:27:49 +
+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/tr...@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
+
diff --git 
a/debian/patches/0002--bug-11754-Fix-segfault-if-sound-device-is-not-ava.patch 
b/debian/patches/0002--bug-11754-Fix-segfault-if-sound-device-is-not-ava.patch
new file mode 100644
index 000..50a40b6
--- /dev/null
+++ 
b/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 gentilde...@30ef787d-52ff-0310-b286-e08351bb7647
+Date: Thu, 29 May 2008 21:00:36 +
+Subject: [PATCH] [bug #11754] Fix segfault if sound device is not available
+
+git-svn-id: svn+ssh://svn.gna.org/svn/wormux/tr...@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
+--- 

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 4a278bb710df929acbde787ca49a61506f2c09ee
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Mon Aug 25 12:04:52 2008 +0300

updated standards version to 3.8.0

- bumped standards version
- wrapped the Uploaders field
- added a debian/README.source file

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..62a71a7
--- /dev/null
+++ b/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 --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
+
diff --git a/debian/changelog b/debian/changelog
index 48524f0..2675579 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,11 @@ wormux (1:0.8-2) UNRELEASED; urgency=low
 - 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.petri...@gmail.com  Sun, 24 Aug 2008 12:04:02 +0300
+ -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 26 Aug 2008 11:14:16 +0300
 
 wormux (1:0.8-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b07364e..9b24ed0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,13 @@ Source: wormux
 Section: games
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
-Uploaders: Jean Parpaillon (artefact) artef...@altern.org, Eddy Petrișor 
eddy.petri...@gmail.com, Cyril Brulebois k...@debian.org, Sam Hocevar 
(Debian packages) sam+...@zoy.org, Gerfried Fuchs rho...@debian.at
+Uploaders: Jean Parpaillon (artefact) artef...@altern.org,
+   Eddy Petrișor eddy.petri...@gmail.com,
+   Cyril Brulebois k...@debian.org,
+   Sam Hocevar (Debian packages) sam+...@zoy.org,
+   Gerfried Fuchs rho...@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.7.3
+Standards-Version: 3.8.0
 Homepage: http://wormux.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/wormux/
 Vcs-Browser: http://git.debian.org/?p=pkg-games/wormux.git;a=summary
diff --git a/debian/control.in b/debian/control.in
index c8b8789..2a94473 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,9 +2,13 @@ Source: wormux
 Section: games
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
-Uploaders: Jean Parpaillon (artefact) artef...@altern.org, Eddy Petrișor 
eddy.petri...@gmail.com, Cyril Brulebois k...@debian.org, Sam Hocevar 
(Debian packages) sam+...@zoy.org, Gerfried Fuchs rho...@debian.at
+Uploaders: Jean Parpaillon (artefact) artef...@altern.org,
+   Eddy Petrișor eddy.petri...@gmail.com,
+   Cyril Brulebois k...@debian.org,
+   Sam Hocevar (Debian packages) sam+...@zoy.org,
+   Gerfried Fuchs rho...@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-Git: git://git.debian.org/git/pkg-games/wormux/
 Vcs-Browser: http://git.debian.org/?p=pkg-games/wormux.git;a=summary

-- 
Wormux PKG

___
Pkg-games-commits mailing list

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 922abd05d979b494ee94a0bb7f6fbec9bb6dec87
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Aug 26 11:58:48 2008 +0300

fix spelling error, thanks lintian

diff --git a/debian/changelog b/debian/changelog
index 2675579..928309e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ wormux (1:0.8-2) UNRELEASED; urgency=low
should help sorting new upstream beta versions correctly.
 
   [ Eddy Petrișor ]
-  * moved to git for maintainance and changed Vcs-* fields accordingly
+  * 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

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit acab898334b7ed1542fb29fc02c12f6e73ae7f7f
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Wed Aug 27 10:35:36 2008 +0300

prepare for release

diff --git a/debian/changelog b/debian/changelog
index 928309e..87fe18e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wormux (1:0.8-2) UNRELEASED; urgency=low
+wormux (1:0.8-2) unstable; urgency=low
 
   [ Cyril Brulebois ]
   * debian/control.in:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit e0064fff44ab0c57a430eae9b12f0805b71d652d
Merge: acab898334b7ed1542fb29fc02c12f6e73ae7f7f 
d23acf240e867a24c28fc602e79b9e1ce5c80acb
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Nov 4 02:36:30 2008 +0200

Merge commit 'upstream/0.8.2'


-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 6003864c1df1784a039e4274950aa31dbb39d5b2
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Nov 4 03:09:22 2008 +0200

0.8.2; s/libxml++2.6-dev/libxml2-dev/ build-dep, correct since 0.8.0

new upstream version 0.8.2
downgrade the libxml++2.6-dev build-dep to libxml2-dev since it is the 
right thing since 0.8.0

diff --git a/debian/changelog b/debian/changelog
index 87fe18e..35048c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wormux (1:0.8.2-1) unstable; urgency=low
+
+  * New Upstream Version
+  * replaced the heavy libxml++2.6-dev build-dep with the libxml2-dev,
+since only the later is necessary starting with 0.8
+
+ -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 04 Nov 2008 03:07:45 +0200
+
 wormux (1:0.8-2) unstable; urgency=low
 
   [ Cyril Brulebois ]
diff --git a/debian/control b/debian/control
index 9b24ed0..f1bbd7b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Jean Parpaillon (artefact) artef...@altern.org,
Cyril Brulebois k...@debian.org,
Sam Hocevar (Debian packages) sam+...@zoy.org,
Gerfried Fuchs rho...@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)
+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), libxml2-dev, libcurl4-gnutls-dev, fontconfig, 
ttf-dejavu, dpkg-dev (= 1.13.19)
 Standards-Version: 3.8.0
 Homepage: http://wormux.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/wormux/
diff --git a/debian/control.in b/debian/control.in
index 2a94473..41fef08 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,7 +7,7 @@ Uploaders: Jean Parpaillon (artefact) artef...@altern.org,
Cyril Brulebois k...@debian.org,
Sam Hocevar (Debian packages) sam+...@zoy.org,
Gerfried Fuchs rho...@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)
+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), libxml2-dev, libcurl4-gnutls-dev, fontconfig, ttf-dejavu, dpkg-dev 
(= 1.13.19)
 Standards-Version: 3.8.0
 Homepage: http://wormux.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/wormux/

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit ca2c92e923c9f01e5700bc01a74ef5831bdce304
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Nov 4 03:35:26 2008 +0200

dropped all patches since they originated upstream trunk

diff --git a/debian/changelog b/debian/changelog
index 35048c5..c1ca0c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ wormux (1:0.8.2-1) unstable; urgency=low
   * New Upstream Version
   * replaced the heavy libxml++2.6-dev build-dep with the libxml2-dev,
 since only the later is necessary starting with 0.8
+  * dropped all patches since they originated upstream trunk
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 04 Nov 2008 03:07:45 +0200
+ -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 04 Nov 2008 03:35:05 +0200
 
 wormux (1:0.8-2) unstable; urgency=low
 
diff --git 
a/debian/patches/0001--bug-11741-Chat-s-and-backspace-pressed-quickly-c.patch 
b/debian/patches/0001--bug-11741-Chat-s-and-backspace-pressed-quickly-c.patch
deleted file mode 100644
index 12c7a65..000
--- 
a/debian/patches/0001--bug-11741-Chat-s-and-backspace-pressed-quickly-c.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c0448e6fb84e5549e19dcbd69159c99119c0f7ee Mon Sep 17 00:00:00 2001
-From: gentildemon gentilde...@30ef787d-52ff-0310-b286-e08351bb7647
-Date: Thu, 29 May 2008 20:27:49 +
-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/tr...@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
-
diff --git 
a/debian/patches/0002--bug-11754-Fix-segfault-if-sound-device-is-not-ava.patch 
b/debian/patches/0002--bug-11754-Fix-segfault-if-sound-device-is-not-ava.patch
deleted file mode 100644
index 50a40b6..000
--- 
a/debian/patches/0002--bug-11754-Fix-segfault-if-sound-device-is-not-ava.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 600d0ef3a326733acba8197c9868b5e4681a72bd Mon Sep 17 00:00:00 2001
-From: gentildemon gentilde...@30ef787d-52ff-0310-b286-e08351bb7647
-Date: Thu, 29 May 2008 21:00:36 +
-Subject: [PATCH] [bug #11754] Fix segfault if sound device is not available
-
-git-svn-id: svn+ssh://svn.gna.org/svn/wormux/tr...@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::setstd::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::vectorstd::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::setstd::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
-
diff --git 
a/debian/patches/0003--BUGFIX-Disconnect-server-from-index-server-as-soon.patch 
b/debian/patches/0003--BUGFIX-Disconnect-server-from-index-server-as-soon.patch
deleted file mode 100644
index 144d53c..000
--- 
a/debian/patches/0003--BUGFIX-Disconnect-server-from-index-server-as-soon.patch
+++ /dev/null

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit b017a3ef484d896e3cad9c0780f98b25c50d5987
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Nov 4 03:55:51 2008 +0200

upload to experimental

diff --git a/debian/changelog b/debian/changelog
index c1ca0c7..648ad32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-wormux (1:0.8.2-1) unstable; urgency=low
+wormux (1:0.8.2-1) experimental; urgency=low
 
   * New Upstream Version
+  * upload to experimental
   * replaced the heavy libxml++2.6-dev build-dep with the libxml2-dev,
 since only the later is necessary starting with 0.8
   * dropped all patches since they originated upstream trunk
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 04 Nov 2008 03:35:05 +0200
+ -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 04 Nov 2008 03:55:12 +0200
 
 wormux (1:0.8-2) unstable; urgency=low
 

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit afb74ea6ba6923c41888703e9d9fee5cc709246b
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Nov 4 05:23:10 2008 +0200

New Upstream Version (Closes: 500930)

diff --git a/debian/changelog b/debian/changelog
index 648ad32..e788906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
 wormux (1:0.8.2-1) experimental; urgency=low
 
-  * New Upstream Version
+  * New Upstream Version (Closes: 500930)
   * upload to experimental
   * replaced the heavy libxml++2.6-dev build-dep with the libxml2-dev,
 since only the later is necessary starting with 0.8
   * dropped all patches since they originated upstream trunk
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 04 Nov 2008 03:55:12 +0200
+ -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 04 Nov 2008 05:22:37 +0200
 
 wormux (1:0.8-2) unstable; urgency=low
 

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Gerfried Fuchs
The following commit has been merged in the master branch:
commit 6238b0a0ee5a9fd6966bb20bb0d9c30ed2765db8
Author: Gerfried Fuchs rho...@debian.at
Date:   Tue Mar 10 09:21:09 2009 +0100

Add ${misc:Depends} to wormux-data as suggested by lintian.

diff --git a/debian/changelog b/debian/changelog
index e788906..d18e1c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wormux (1:0.8.2-2) unstable; urgency=low
+
+  [ Gerfried Fuchs ]
+  * Upload to unstable.
+  * Add ${misc:Depends} to wormux-data as suggested by lintian.
+
+ -- Gerfried Fuchs rho...@debian.at  Tue, 10 Mar 2009 09:19:15 +0100
+
 wormux (1:0.8.2-1) experimental; urgency=low
 
   * New Upstream Version (Closes: 500930)
diff --git a/debian/control b/debian/control
index f1bbd7b..c613db1 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Description: funny fight game on 2D maps
 
 Package: wormux-data
 Architecture: all
-Depends: ttf-dejavu
+Depends: ttf-dejavu, ${misc:Depends}
 Recommends: wormux (= ${source:Version})
 Conflicts: wormux ( 0.8beta2-1)
 Description: data files for the wormux game

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Gerfried Fuchs
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Gerfried Fuchs
The following commit has been merged in the master branch:
commit 2a0f3d4560cab89e5595ac0886d2f3e724d7fa51
Merge: 6238b0a0ee5a9fd6966bb20bb0d9c30ed2765db8 
c846ece410ca9fd7debb46e553a218c21f7565e8
Author: Gerfried Fuchs rho...@debian.at
Date:   Tue Mar 17 10:58:22 2009 +0100

Merge commit 'upstream/0.8.3'


-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Gerfried Fuchs
The following commit has been merged in the master branch:
commit e3af26405155583b38bbf31f1294dc93b2e9ddb0
Author: Gerfried Fuchs rho...@debian.at
Date:   Tue Mar 17 10:59:43 2009 +0100

New Upstream Version (Closes: #520038)

diff --git a/debian/changelog b/debian/changelog
index d18e1c9..bec0988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-wormux (1:0.8.2-2) unstable; urgency=low
+wormux (1:0.8.3-1) unstable; urgency=low
 
   [ Gerfried Fuchs ]
+  * New Upstream Version (Closes: #520038)
   * Upload to unstable.
   * Add ${misc:Depends} to wormux-data as suggested by lintian.
 
- -- Gerfried Fuchs rho...@debian.at  Tue, 10 Mar 2009 09:19:15 +0100
+ -- Gerfried Fuchs rho...@debian.at  Tue, 17 Mar 2009 10:58:26 +0100
 
 wormux (1:0.8.2-1) experimental; urgency=low
 

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Gerfried Fuchs
The following commit has been merged in the master branch:
commit 676044f50549635bba3c3bccbcc020c54684ff5e
Author: Gerfried Fuchs rho...@debian.at
Date:   Tue Mar 17 11:10:47 2009 +0100

also add ${misc:Depends} in control.in file

diff --git a/debian/control.in b/debian/control.in
index 41fef08..ba644d8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -32,7 +32,7 @@ Description: funny fight game on 2D maps
 
 Package: wormux-data
 Architecture: all
-Depends: ttf-dejavu
+Depends: ttf-dejavu, ${misc:Depends}
 Recommends: wormux (= ${source:Version})
 Conflicts: wormux ( 0.8beta2-1)
 Description: data files for the wormux game

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Gerfried Fuchs
The following commit has been merged in the master branch:
commit 7e2d605fbd5f3ec368b9495e151533e91f46b4eb
Author: Gerfried Fuchs rho...@debian.at
Date:   Tue Mar 17 11:12:57 2009 +0100

Bump Standards-Version to 3.8.1

diff --git a/debian/changelog b/debian/changelog
index bec0988..52f102d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ wormux (1:0.8.3-1) unstable; urgency=low
   * New Upstream Version (Closes: #520038)
   * Upload to unstable.
   * Add ${misc:Depends} to wormux-data as suggested by lintian.
+  * Bump Standards-Version to 3.8.1.
 
  -- Gerfried Fuchs rho...@debian.at  Tue, 17 Mar 2009 10:58:26 +0100
 
diff --git a/debian/control b/debian/control
index c613db1..00e6f9a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Jean Parpaillon (artefact) artef...@altern.org,
Sam Hocevar (Debian packages) sam+...@zoy.org,
Gerfried Fuchs rho...@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), libxml2-dev, libcurl4-gnutls-dev, fontconfig, 
ttf-dejavu, dpkg-dev (= 1.13.19)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://wormux.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/wormux/
 Vcs-Browser: http://git.debian.org/?p=pkg-games/wormux.git;a=summary

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Gerfried Fuchs
The following commit has been merged in the master branch:
commit 337863cd97d14d1399cc1097bc52f4f9c6ae90d8
Author: Gerfried Fuchs rho...@debian.at
Date:   Tue Mar 17 13:03:01 2009 +0100

Added a blurb to the copyright file about the Debian packaging licensing

diff --git a/debian/changelog b/debian/changelog
index 52f102d..74934e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
 wormux (1:0.8.3-1) unstable; urgency=low
 
-  [ Gerfried Fuchs ]
   * New Upstream Version (Closes: #520038)
   * Upload to unstable.
   * Add ${misc:Depends} to wormux-data as suggested by lintian.
   * Bump Standards-Version to 3.8.1.
+  * Added a blurb to the copyright file about the Debian packaging licensing.
 
- -- Gerfried Fuchs rho...@debian.at  Tue, 17 Mar 2009 10:58:26 +0100
+ -- Gerfried Fuchs rho...@debian.at  Tue, 17 Mar 2009 13:02:33 +0100
 
 wormux (1:0.8.2-1) experimental; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 73154c8..f4da599 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,12 @@ License: BSD
   /usr/share/common-licenses/BSB
 
 
+The debianization of the package as a whole is BSD licensed and is
+Copyright 2006-2009 by the Wormux packagers
+See changelog.Debian for the particular people having laid their hands
+on it.
+
+
 It was downloaded from http://wormux.org/
 
 Copyright (2001-2008):

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Gerfried Fuchs
The following commit has been merged in the master branch:
commit b14485fffec590212e40e2ffd3b46886832ce5a1
Author: Gerfried Fuchs rho...@deb.at
Date:   Tue Jul 14 11:43:50 2009 +0200

Removed myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index 74934e7..feea7f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wormux (1:0.8.3-2) unstable; urgency=low
+
+  [ Gerfried Fuchs ]
+  * Removed myself from Uploaders - can't bear the load of wormux upstream
+source in VCS, sorry.
+
+ -- 
+
 wormux (1:0.8.3-1) unstable; urgency=low
 
   * New Upstream Version (Closes: #520038)
diff --git a/debian/control b/debian/control
index 00e6f9a..a39e99c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Games Team 
pkg-games-de...@lists.alioth.debian.org
 Uploaders: Jean Parpaillon (artefact) artef...@altern.org,
Eddy Petrișor eddy.petri...@gmail.com,
Cyril Brulebois k...@debian.org,
-   Sam Hocevar (Debian packages) sam+...@zoy.org,
-   Gerfried Fuchs rho...@debian.at
+   Sam Hocevar (Debian packages) sam+...@zoy.org
 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), libxml2-dev, libcurl4-gnutls-dev, fontconfig, 
ttf-dejavu, dpkg-dev (= 1.13.19)
 Standards-Version: 3.8.1
 Homepage: http://wormux.org/

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 6b1c66126c0f47efe1e07a428cd27f4309c39462
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Fri Jul 24 19:18:52 2009 +0200

fix the chaneglog so dch and all others tools don't choke

diff --git a/debian/changelog b/debian/changelog
index feea7f3..6e04a8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ wormux (1:0.8.3-2) unstable; urgency=low
   * Removed myself from Uploaders - can't bear the load of wormux upstream
 source in VCS, sorry.
 
- -- 
+ -- Eddy Petrișor eddy.petri...@gmail.com  Fri, 24 Jul 2009 19:17:52 +0200
 
 wormux (1:0.8.3-1) unstable; urgency=low
 

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit f12027ae1fb78a269c4a3d037e980b75a2c7ddad
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Sat Jul 25 01:01:03 2009 +0200

new upstream version

diff --git a/debian/changelog b/debian/changelog
index 6e04a8a..15f9598 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wormux (1:0.8.4-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 25 Jul 2009 00:59:50 +0200
+
 wormux (1:0.8.3-2) unstable; urgency=low
 
   [ Gerfried Fuchs ]

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit d7f6aca11a764f69f8dde3ea848e6c6b71ea176e
Merge: 6b1c66126c0f47efe1e07a428cd27f4309c39462 
ccff833728d390d19798932a8905f1a3d5d02bee
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Sat Jul 25 00:59:49 2009 +0200

Merge commit 'upstream/0.8.4'


-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit fe3313a205107d1a242d3d155ae56aa55e1953f4
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Sat Jul 25 01:03:05 2009 +0200

merge in the previous unpublished version changelog

diff --git a/debian/changelog b/debian/changelog
index 15f9598..387fe7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,13 @@
 wormux (1:0.8.4-1) unstable; urgency=low
 
+  [ Eddy Petrișor ]
   * New Upstream Version
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 25 Jul 2009 00:59:50 +0200
-
-wormux (1:0.8.3-2) unstable; urgency=low
-
   [ Gerfried Fuchs ]
   * Removed myself from Uploaders - can't bear the load of wormux upstream
 source in VCS, sorry.
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Fri, 24 Jul 2009 19:17:52 +0200
+ -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 25 Jul 2009 01:01:09 +0200
 
 wormux (1:0.8.3-1) unstable; urgency=low
 

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 277380643691eb10506f8f23d7e49dd3673bc955
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Sat Jul 25 01:07:07 2009 +0200

resync control.in; somebody updated control directly

diff --git a/debian/changelog b/debian/changelog
index 387fe7e..98f7768 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,10 @@ wormux (1:0.8.4-1) unstable; urgency=low
   * Removed myself from Uploaders - can't bear the load of wormux upstream
 source in VCS, sorry.
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 25 Jul 2009 01:01:09 +0200
+  [ Eddy Petrișor ]
+  * resync control.in; somebody updated control directly
+
+ -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 25 Jul 2009 01:06:20 +0200
 
 wormux (1:0.8.3-1) unstable; urgency=low
 
diff --git a/debian/control.in b/debian/control.in
index ba644d8..692102e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,9 +6,8 @@ Uploaders: Jean Parpaillon (artefact) artef...@altern.org,
Eddy Petrișor eddy.petri...@gmail.com,
Cyril Brulebois k...@debian.org,
Sam Hocevar (Debian packages) sam+...@zoy.org,
-   Gerfried Fuchs rho...@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), libxml2-dev, libcurl4-gnutls-dev, fontconfig, ttf-dejavu, dpkg-dev 
(= 1.13.19)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://wormux.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/wormux/
 Vcs-Browser: http://git.debian.org/?p=pkg-games/wormux.git;a=summary

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit a53ef8887e26f0f09c2cea1ce074a861c91188d8
Author: Eddy Petrisor e...@epetrisor.dsd.ro
Date:   Wed Aug 19 14:58:40 2009 +0300

add wormux-servers pack: the index and game servers are there

diff --git a/debian/control.in b/debian/control.in
index 692102e..99fb105 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -29,6 +29,30 @@ Description: funny fight game on 2D maps
  downloaded from the Internet, making strategy an important part of
  each battle.
 
+Package: wormux-servers
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: wormux (= ${source:Version})
+Conflicts: wormux ( 0.8beta2-1)
+Description: stand alone server and game index server for wormux
+ 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,
+ Teleportation, etc.). For the moment, you can not play against
+ computer opponents.
+ .
+ There are also lots of maps available for your battling pleasure!
+ Wormux takes the genre to the next level, with great customisation
+ options leading to great gameplay. There is a wide selection of
+ teams, from the Aliens to the Chickens. Also, new battlefields can be
+ downloaded from the Internet, making strategy an important part of
+ each battle.
+ .
+ This package contains the stand alone server and the index server for
+ Wormux. You will need this package if you want to host a wormux
+ server or a wormux index server. If you want to play the game, you
+ need to install the wormux package
+
 Package: wormux-data
 Architecture: all
 Depends: ttf-dejavu, ${misc:Depends}
diff --git a/debian/wormux-servers.dirs b/debian/wormux-servers.dirs
new file mode 100644
index 000..33359b8
--- /dev/null
+++ b/debian/wormux-servers.dirs
@@ -0,0 +1 @@
+usr/games
diff --git a/debian/wormux-servers.install b/debian/wormux-servers.install
new file mode 100644
index 000..aba5aff
--- /dev/null
+++ b/debian/wormux-servers.install
@@ -0,0 +1,2 @@
+usr/games/wormux-index-server
+usr/games/wormux-server

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 3b08561ebfedef9f51723cf38f6642c792963497
Author: Eddy Petrisor e...@epetrisor.dsd.ro
Date:   Wed Aug 19 17:38:34 2009 +0300

regenerated control on lenny

diff --git a/debian/control b/debian/control
index a39e99c..4ec8807 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Games Team 
pkg-games-de...@lists.alioth.debian.org
 Uploaders: Jean Parpaillon (artefact) artef...@altern.org,
Eddy Petrișor eddy.petri...@gmail.com,
Cyril Brulebois k...@debian.org,
-   Sam Hocevar (Debian packages) sam+...@zoy.org
-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), libxml2-dev, libcurl4-gnutls-dev, fontconfig, 
ttf-dejavu, dpkg-dev (= 1.13.19)
+   Sam Hocevar (Debian packages) sam+...@zoy.org,
+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), libxml2-dev, libcurl4-gnutls-dev, fontconfig, ttf-dejavu, dpkg-dev 
(= 1.13.19)
 Standards-Version: 3.8.1
 Homepage: http://wormux.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/wormux/
@@ -29,6 +29,30 @@ Description: funny fight game on 2D maps
  downloaded from the Internet, making strategy an important part of
  each battle.
 
+Package: wormux-servers
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: wormux (= ${source:Version})
+Conflicts: wormux ( 0.8beta2-1)
+Description: stand alone server and game index server for wormux
+ 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,
+ Teleportation, etc.). For the moment, you can not play against
+ computer opponents.
+ .
+ There are also lots of maps available for your battling pleasure!
+ Wormux takes the genre to the next level, with great customisation
+ options leading to great gameplay. There is a wide selection of
+ teams, from the Aliens to the Chickens. Also, new battlefields can be
+ downloaded from the Internet, making strategy an important part of
+ each battle.
+ .
+ This package contains the stand alone server and the index server for
+ Wormux. You will need this package if you want to host a wormux
+ server or a wormux index server. If you want to play the game, you
+ need to install the wormux package
+
 Package: wormux-data
 Architecture: all
 Depends: ttf-dejavu, ${misc:Depends}

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread root
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread root
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 2733a089378f6ae77ca5af00c94ef6c922c26516
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Sep 22 10:41:31 2009 +0300

new upstream; note the changes made in the unpublished 0.8.4-1 version

diff --git a/debian/changelog b/debian/changelog
index 98f7768..76c099e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wormux (1:0.8.5-1) unstable; urgency=low
+
+  * New upstream version
+  * new binary package wormux-servers: contains wormux-index-server
+and wormux-game-server
+
+ -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 22 Sep 2009 10:25:22 +0300
+
 wormux (1:0.8.4-1) unstable; urgency=low
 
   [ Eddy Petrișor ]

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit e2b4bc5920874ce8b5ca2f8e4e1ebbbe717c2f91
Merge: 84fe83c73bab5e13ada8b435b941d83ecef71631 
6619b1eec0f25a06f3ff052b6c0d5e5097c49286
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Sep 22 10:24:23 2009 +0300

Merge commit 'upstream/0.8.5'

Conflicts:

configure


-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit dc8ad893f7c386e097a6f0aa9bece0fb7964542e
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Sep 22 10:44:46 2009 +0300

enable fribidi

diff --git a/debian/rules b/debian/rules
index 119883a..ea31e64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ 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_CONFIGURE_EXTRA_FLAGS += --bindir=\$${prefix}/games 
--with-datadir-name=\$${prefix}/share/games/wormux 
--with-localedir-name=\$${prefix}/share/locale --with-font-path=$(FONT_PATH) 
--enable-fribidi
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 
 srcpkg = $(shell dpkg-parsechangelog | sed -ne 's/Source: *//p')

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 3c915454339d905c6de85cfd82aab5aabd53adb4
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Sep 22 10:55:14 2009 +0300

hopefully cleared up that having a game server is not absolutely necessary

diff --git a/debian/control b/debian/control
index 4ec8807..c276052 100644
--- a/debian/control
+++ b/debian/control
@@ -49,9 +49,14 @@ Description: stand alone server and game index server for 
wormux
  each battle.
  .
  This package contains the stand alone server and the index server for
- Wormux. You will need this package if you want to host a wormux
- server or a wormux index server. If you want to play the game, you
- need to install the wormux package
+ Wormux. You will need this package if you want to host a standalone
+ wormux server or a wormux index server which can be always available
+ for anyone who might want to play.
+ .
+ Note that if you want to play a network game, this package is not
+ absolutely necessary since any of the game players can host the game.
+ .
+ If you want to play the game, you need to install the wormux package.
 
 Package: wormux-data
 Architecture: all
diff --git a/debian/control.in b/debian/control.in
index 99fb105..48e104a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -49,9 +49,14 @@ Description: stand alone server and game index server for 
wormux
  each battle.
  .
  This package contains the stand alone server and the index server for
- Wormux. You will need this package if you want to host a wormux
- server or a wormux index server. If you want to play the game, you
- need to install the wormux package
+ Wormux. You will need this package if you want to host a standalone
+ wormux server or a wormux index server which can be always available
+ for anyone who might want to play.
+ .
+ Note that if you want to play a network game, this package is not
+ absolutely necessary since any of the game players can host the game.
+ .
+ If you want to play the game, you need to install the wormux package.
 
 Package: wormux-data
 Architecture: all

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 1a28a473e319bdecef9cd528f906789646bda65f
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Sep 22 11:08:59 2009 +0300

really build the servers

diff --git a/debian/rules b/debian/rules
index ea31e64..9a1902d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ 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) 
--enable-fribidi
+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) 
--enable-fribidi --enable-servers
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 
 srcpkg = $(shell dpkg-parsechangelog | sed -ne 's/Source: *//p')

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 46ae6b97c510d057682c8cc298a7ab82c4a05742
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Sep 22 23:22:57 2009 +0300

build depend on libfribidi-dev, too

diff --git a/debian/changelog b/debian/changelog
index 76c099e..2d0547f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ wormux (1:0.8.5-1) unstable; urgency=low
   * New upstream version
   * new binary package wormux-servers: contains wormux-index-server
 and wormux-game-server
+  * enabled fribidi support (adds a new build-dep on libfribidi-dev)
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 22 Sep 2009 10:25:22 +0300
+ -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 22 Sep 2009 23:23:14 +0300
 
 wormux (1:0.8.4-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c276052..21acde3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,10 @@ Uploaders: Jean Parpaillon (artefact) artef...@altern.org,
Eddy Petrișor eddy.petri...@gmail.com,
Cyril Brulebois k...@debian.org,
Sam Hocevar (Debian packages) sam+...@zoy.org,
-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), libxml2-dev, libcurl4-gnutls-dev, fontconfig, ttf-dejavu, dpkg-dev 
(= 1.13.19)
+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),
+   libxml2-dev, libcurl4-gnutls-dev, fontconfig, ttf-dejavu,
+   dpkg-dev (= 1.13.19), libfribidi-dev
 Standards-Version: 3.8.1
 Homepage: http://wormux.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/wormux/
diff --git a/debian/control.in b/debian/control.in
index 48e104a..2f84211 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,7 +6,10 @@ Uploaders: Jean Parpaillon (artefact) artef...@altern.org,
Eddy Petrișor eddy.petri...@gmail.com,
Cyril Brulebois k...@debian.org,
Sam Hocevar (Debian packages) sam+...@zoy.org,
-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), libxml2-dev, libcurl4-gnutls-dev, fontconfig, ttf-dejavu, dpkg-dev 
(= 1.13.19)
+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),
+   libxml2-dev, libcurl4-gnutls-dev, fontconfig, ttf-dejavu,
+   dpkg-dev (= 1.13.19), libfribidi-dev
 Standards-Version: 3.8.1
 Homepage: http://wormux.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/wormux/

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit d59c608a7ccbad451d082862dc30c42c18957505
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Tue Sep 22 23:25:43 2009 +0300

small typo fix in debian/README.source

diff --git a/debian/README.source b/debian/README.source
index 62a71a7..c398463 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -23,7 +23,7 @@ Description: Remove source modifications that are currently 
being applied
 
 Task: converting upstream tarball
 Tools: bzcat, gzip
-Command: bzcat wormux-0.8.tar.bz2 | gzip --best -c  wormux_0.5.orig.tar.gz
+Command: bzcat wormux-0.8.tar.bz2 | gzip --best -c  wormux_0.8.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
diff --git a/debian/changelog b/debian/changelog
index 2d0547f..fdb9ab9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ wormux (1:0.8.5-1) unstable; urgency=low
   * new binary package wormux-servers: contains wormux-index-server
 and wormux-game-server
   * enabled fribidi support (adds a new build-dep on libfribidi-dev)
+  * small typo fix in debian/README.source
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 22 Sep 2009 23:23:14 +0300
+ -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 22 Sep 2009 23:25:25 +0300
 
 wormux (1:0.8.4-1) unstable; urgency=low
 

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit a45596f458e70cd6c7acfe6ce33ffc03755e6536
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Wed Sep 23 01:56:15 2009 +0300

install howto play guides

diff --git a/debian/changelog b/debian/changelog
index fdb9ab9..99daa54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ wormux (1:0.8.5-1) unstable; urgency=low
 and wormux-game-server
   * enabled fribidi support (adds a new build-dep on libfribidi-dev)
   * small typo fix in debian/README.source
+  * install howto play guides
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Tue, 22 Sep 2009 23:25:25 +0300
+ -- Eddy Petrișor eddy.petri...@gmail.com  Wed, 23 Sep 2009 01:56:04 +0300
 
 wormux (1:0.8.4-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 9a1902d..8f7f58e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,9 @@ install/wormux-data::
rm debian/tmp/usr/share/games/wormux/*.xpm
rm debian/tmp/usr/share/games/wormux/*.svg
rm debian/tmp/usr/share/games/wormux/*.png
+   mkdir -p debian/tmp/usr/share/doc/wormux
+   cp -r doc/howto_play debian/tmp/usr/share/doc/wormux/
+   cp -r doc/howto_play_online debian/tmp/usr/share/doc/wormux/
 
 # use this rule manually to update the build dependencies
 # updating them automatically is evil and is a reason for
diff --git a/debian/wormux-data.install b/debian/wormux-data.install
index 0c7cc4d..3119bba 100644
--- a/debian/wormux-data.install
+++ b/debian/wormux-data.install
@@ -1,2 +1,3 @@
 usr/share/games/wormux/
 usr/share/locale/
+usr/share/doc/wormux/

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 0d9eaded704d88a27b729dc4debd0f854cd59afa
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Sat Sep 26 16:51:27 2009 +0300

install example configuration files for the servers

diff --git a/debian/changelog b/debian/changelog
index 99daa54..8c1729a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ wormux (1:0.8.5-1) unstable; urgency=low
   * enabled fribidi support (adds a new build-dep on libfribidi-dev)
   * small typo fix in debian/README.source
   * install howto play guides
+  * install example configuration files for the servers
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Wed, 23 Sep 2009 01:56:04 +0300
+ -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 26 Sep 2009 16:51:03 +0300
 
 wormux (1:0.8.4-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 8f7f58e..979eb62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,6 +51,11 @@ install/wormux-data::
cp -r doc/howto_play debian/tmp/usr/share/doc/wormux/
cp -r doc/howto_play_online debian/tmp/usr/share/doc/wormux/
 
+install/wormux-servers::
+   mkdir -p debian/tmp/usr/share/doc/wormux/examples
+   cp tools/servers/index_server/wormux_index_server.conf 
debian/tmp/usr/share/doc/wormux/examples
+   cp tools/servers/game_server/wormux_server.conf 
debian/tmp/usr/share/doc/wormux/examples
+
 # use this rule manually to update the build dependencies
 # updating them automatically is evil and is a reason for
 # rejects for NEW processing;
diff --git a/debian/wormux-servers.install b/debian/wormux-servers.install
index aba5aff..4959e9f 100644
--- a/debian/wormux-servers.install
+++ b/debian/wormux-servers.install
@@ -1,2 +1,3 @@
 usr/games/wormux-index-server
 usr/games/wormux-server
+usr/share/doc/wormux/examples/*

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 239e98af2b6718aa7f0e3b647d411e9f1f2f9d39
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Sat Sep 26 17:00:26 2009 +0300

New upstream version (Closes: 536565)

diff --git a/debian/changelog b/debian/changelog
index 8c1729a..0609387 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 wormux (1:0.8.5-1) unstable; urgency=low
 
-  * New upstream version
+  * New upstream version (Closes: 536565)
   * new binary package wormux-servers: contains wormux-index-server
 and wormux-game-server
   * enabled fribidi support (adds a new build-dep on libfribidi-dev)
@@ -8,7 +8,7 @@ wormux (1:0.8.5-1) unstable; urgency=low
   * install howto play guides
   * install example configuration files for the servers
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 26 Sep 2009 16:51:03 +0300
+ -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 26 Sep 2009 17:00:01 +0300
 
 wormux (1:0.8.4-1) unstable; urgency=low
 

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 38b6eb603fcaa3aabf0e339c22b62d5cec65de2c
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Sat Sep 26 18:05:13 2009 +0300

providing the howtos closes 382822

diff --git a/debian/changelog b/debian/changelog
index 0609387..7fabad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,10 @@ wormux (1:0.8.5-1) unstable; urgency=low
 and wormux-game-server
   * enabled fribidi support (adds a new build-dep on libfribidi-dev)
   * small typo fix in debian/README.source
-  * install howto play guides
+  * install howto play guides (Closes: 382822)
   * install example configuration files for the servers
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 26 Sep 2009 17:00:01 +0300
+ -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 26 Sep 2009 18:03:25 +0300
 
 wormux (1:0.8.4-1) unstable; urgency=low
 

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit a92b1adb9d003c638fa74a0891f45de28b0d52d0
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Mon Sep 28 01:47:35 2009 +0300

keep the original config.h and pot file even after clean

diff --git a/debian/rules b/debian/rules
index 979eb62..8a225e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,14 @@ srcver = $(shell dpkg-parsechangelog | sed -ne 's/Version: 
*\(.*:\)\?\(.*\)-.*$$
 
 check-tarball: ../$(srcpkg)_$(srcver).orig.tar.gz
 
+makebuilddir::
+   [ -f src/config.h.clean ] || cp src/config.h src/config.h.clean
+   [ -f po/wormux.pot.clean ] || cp po/wormux.pot po/wormux.pot.clean
+
+clean::
+   [ -f src/config.h.clean ]  mv src/config.h.clean src/config.h || :
+   [ -f po/wormux.pot ] || mv po/wormux.pot.clean po/wormux.pot
+
 .PHONY: check-tarball
 
 #}}}

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 2b7c545c3c044e2a0eb2b46d323698c0c26caefe
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Mon Sep 28 01:48:12 2009 +0300

make sure the po files are not regenerated

patch the po Makefile so it doesn't remove stamp-po

diff --git a/debian/patches/0001-dont-remove-stamp-po.diff 
b/debian/patches/0001-dont-remove-stamp-po.diff
new file mode 100644
index 000..81b10a4
--- /dev/null
+++ b/debian/patches/0001-dont-remove-stamp-po.diff
@@ -0,0 +1,13 @@
+diff --git a/po/Makefile.in b/po/Makefile.in
+index 052f0f7..148595c 100644
+--- a/po/Makefile.in
 b/po/Makefile.in
+@@ -188,7 +188,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ 
+ #MAINTAINERCLEANFILES = Makefile.in
+-MAINTAINERCLEANFILES = stamp-po $(GMOFILES)
++MAINTAINERCLEANFILES = $(GMOFILES)
+ POTFILES = \
+ src/ai/ai_engine.cpp \
+ src/ai/ai_engine.h \
diff --git a/debian/rules b/debian/rules
index 8a225e9..2285f67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ check-tarball: ../$(srcpkg)_$(srcver).orig.tar.gz
 
 makebuilddir::
[ -f src/config.h.clean ] || cp src/config.h src/config.h.clean
-   [ -f po/wormux.pot.clean ] || cp po/wormux.pot po/wormux.pot.clean
+   cp po/wormux.pot po/wormux.pot.clean
 
 clean::
[ -f src/config.h.clean ]  mv src/config.h.clean src/config.h || :

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, master, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The following commit has been merged in the master branch:
commit 69bbd44b2c0ff83edfbf578066154e86e987d9f6
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Mon Sep 28 02:02:57 2009 +0300

make sure that after clean the tree is in a clean state

diff --git a/debian/changelog b/debian/changelog
index 7fabad3..f5665f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ wormux (1:0.8.5-1) unstable; urgency=low
   * small typo fix in debian/README.source
   * install howto play guides (Closes: 382822)
   * install example configuration files for the servers
+  * make sure that after clean the tree is in a clean state
+- patched po/Makefile.in for this
 
- -- Eddy Petrișor eddy.petri...@gmail.com  Sat, 26 Sep 2009 18:03:25 +0300
+ -- Eddy Petrișor eddy.petri...@gmail.com  Mon, 28 Sep 2009 02:03:59 +0300
 
 wormux (1:0.8.4-1) unstable; urgency=low
 

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG tag, debian/0.8.5-1, updated. 69bbd44b2c0ff83edfbf578066154e86e987d9f6

2010-06-27 Thread Eddy Petrișor
The tag, debian/0.8.5-1 has been updated
to  69bbd44b2c0ff83edfbf578066154e86e987d9f6 (commit)
  from  73cac0b51878590a22c5633310861fbf600d89f6

- Shortlog 
commit 69bbd44b2c0ff83edfbf578066154e86e987d9f6
Author: Eddy Petrișor eddy.petri...@gmail.com
Date:   Mon Sep 28 02:02:57 2009 +0300

make sure that after clean the tree is in a clean state
---

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

[SCM] Wormux PKG branch, upstream, deleted. upstream/0.8.3-2-g995dca6

2010-06-27 Thread Eddy Petrișor
The branch, upstream has been deleted
   was  995dca6440c26b6992039062e44ef8839158ac9d

---
995dca6440c26b6992039062e44ef8839158ac9d Imported Upstream version 0.8.5
---

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


[SCM] Wormux PKG branch, pristine-tar, deleted. 39beb8bb056d33681c8dfbcd96e6d80bee61b8a5

2010-06-27 Thread Eddy Petrișor
The branch, pristine-tar has been deleted
   was  39beb8bb056d33681c8dfbcd96e6d80bee61b8a5

---
39beb8bb056d33681c8dfbcd96e6d80bee61b8a5 pristine-tar data for 
wormux_0.8.5.orig.tar.gz
---

-- 
Wormux PKG

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits