[SCM] WarMUX PKG branch, master, updated. 66851e07400683a8c4f568dcbe5477c849ec6dbc

Felix Geyer debfx-pkg at fobos.de
Sun Feb 13 17:01:41 UTC 2011


The following commit has been merged in the master branch:
commit 223cf90c8d4a49cf1a2e8c4197616429db5e399b
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sat Feb 12 20:19:33 2011 +0100

    Rename to WarMUX.

diff --git a/debian/changelog b/debian/changelog
index b54cbcf..b58c032 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+warmux (1:11.01-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Changed name to WarMUX.
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Sat, 12 Feb 2011 19:14:04 +0100
+
 wormux (1:0.9.2.1-1) experimental; urgency=low
 
   * New upstream version. (Closes: #567762; LP: #541078)
diff --git a/debian/control b/debian/control
index b1fb7df..efcc750 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: wormux
+Source: warmux
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
@@ -21,94 +21,92 @@ Build-Depends: debhelper (>= 7.4.10~),
                libxml2-dev
 Standards-Version: 3.9.1
 Homepage: http://www.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
+Vcs-Git: git://git.debian.org/git/pkg-games/warmux/
+Vcs-Browser: http://git.debian.org/?p=pkg-games/warmux.git;a=summary
 
-Package: wormux
+Package: warmux
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, wormux-data (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, warmux-data (= ${source:Version})
 Description: funny fight game on 2D maps
- Wormux is a free game where funny animals fight on a 2D map with
+ WarMUX 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
+ WarMUX 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.
 
-Package: wormux-servers
+Package: warmux-servers
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: 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
+Description: stand alone server and game index server for WarMUX
+ WarMUX 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
+ WarMUX 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 standalone
- wormux server or a wormux index server which can be always available
+ WarMUX. You will need this package if you want to host a standalone
+ WarMUX server or a WarMUX 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.
+ If you want to play the game, you need to install the warmux package.
 
-Package: wormux-data
+Package: warmux-data
 Architecture: all
 Depends: ttf-dejavu, ttf-vlgothic, ttf-wqy-microhei, ${misc:Depends}
-Breaks: wormux (<< 0.8beta2-1)
-Description: data files for the wormux game
- Wormux is a free game where funny animals fight on a 2D map with
+Description: data files for the WarMUX game
+ WarMUX 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
+ WarMUX 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 data like maps and teams. If you want to play
- the game, you need to install the wormux package.
+ the game, you need to install the warmux package.
 
-Package: wormux-dbg
+Package: warmux-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends},
-         wormux (= ${binary:Version}) | wormux-server (= ${binary:Version})
-Description: debugging symbols for the wormux game
- Wormux is a free game where funny animals fight on a 2D map with
+         warmux (= ${binary:Version}) | warmux-server (= ${binary:Version})
+Description: debugging symbols for the WarMUX game
+ WarMUX 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
+ WarMUX 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 debugging symbols associated with wormux and
- wormux-server.
+ This package contains the debugging symbols associated with warmux and
+ warmux-server.
diff --git a/debian/manpages/wormux-index-server.6 b/debian/manpages/wormux-index-server.6
index a288041..a7d7676 100644
--- a/debian/manpages/wormux-index-server.6
+++ b/debian/manpages/wormux-index-server.6
@@ -1,12 +1,12 @@
-.TH WORMUX-INDEX-SERVER 6 "October 05, 2010"
+.TH WARMUX-INDEX-SERVER 6 "October 05, 2010"
 .SH NAME
-wormux\-index\-server \- Wormux index server
+warmux\-index\-server \- WarMUX index server
 .SH SYNOPSIS
 .PP
-\fBwormux\-index\-server\fR [\-d] [\-f \fIconfigfile\fP]
+\fBwarmux\-index\-server\fR [\-d] [\-f \fIconfigfile\fP]
 .SH DESCRIPTION
 .PP
-wormux\-index\-server is the index server for the Wormux game.
+warmux\-index\-server is the index server for the WarMUX game.
 .SH OPTIONS
 .PP
 \-d
diff --git a/debian/manpages/wormux-server.6 b/debian/manpages/wormux-server.6
index 156e620..dabac10 100644
--- a/debian/manpages/wormux-server.6
+++ b/debian/manpages/wormux-server.6
@@ -1,12 +1,12 @@
-.TH WORMUX-SERVER 6 "October 05, 2010"
+.TH WARMUX-SERVER 6 "October 05, 2010"
 .SH NAME
-wormux\-server \- Wormux server
+warmux\-server \- WarMUX server
 .SH SYNOPSIS
 .PP
-\fBwormux\-server\fR [\-f \fIconfigfile\fP]
+\fBwarmux\-server\fR [\-f \fIconfigfile\fP]
 .SH DESCRIPTION
 .PP
-wormux\-server is the dedicated server for the Wormux game.
+warmux\-server is the dedicated server for the WarMUX game.
 .SH AUTHOR
 This manual page was written by Felix Geyer <debfx-pkg at fobos.de> for the Debian
 project (but may be used by others). Permission is granted to copy, distribute
diff --git a/debian/rules b/debian/rules
index dbc9cb9..266717a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,29 +7,29 @@ CXXFLAGS += -Wall -Wextra
 
 override_dh_auto_configure:
 	[ -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
+	[ -f po/warmux.pot.clean ] || cp po/warmux.pot po/warmux.pot.clean
 	
-	dh_auto_configure -- --with-datadir-name=\$${prefix}/share/games/wormux \
+	dh_auto_configure -- --with-datadir-name=\$${prefix}/share/games/warmux \
 	  --bindir=\$${prefix}/games --enable-servers --enable-fribidi
 
 override_dh_auto_install:
 	dh_auto_install
 	
 	# these font files will be replaced with symlinks
-	rm debian/tmp/usr/share/games/wormux/font/DejaVuSans.ttf
-	rm debian/tmp/usr/share/games/wormux/font/VL-Gothic-Regular.ttf
-	rm debian/tmp/usr/share/games/wormux/font/wqy-microhei-lite.ttc
+	rm debian/tmp/usr/share/games/warmux/font/DejaVuSans.ttf
+	rm debian/tmp/usr/share/games/warmux/font/VL-Gothic-Regular.ttf
+	rm debian/tmp/usr/share/games/warmux/font/wqy-microhei-lite.ttc
 	
-	cp debian/tmp/usr/share/games/wormux/wormux_32x32.xpm debian/tmp/usr/share/pixmaps/wormux.xpm
+	cp debian/tmp/usr/share/games/warmux/warmux_32x32.xpm debian/tmp/usr/share/pixmaps/warmux.xpm
 
 override_dh_auto_clean:
 	dh_auto_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
+	[ -f po/warmux.pot ] || mv po/warmux.pot.clean po/warmux.pot
 
 override_dh_install:
 	dh_install --list-missing
 
 override_dh_strip:
-	dh_strip --dbg-package=wormux-dbg
+	dh_strip --dbg-package=warmux-dbg
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 832d5fb..ef3c00b 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,3 +1,3 @@
 # updated by autoreconf
-wormux source: outdated-autotools-helper-file config.sub 2004-03-12
-wormux source: outdated-autotools-helper-file config.guess 2004-03-12
+warmux source: outdated-autotools-helper-file config.sub 2004-03-12
+warmux source: outdated-autotools-helper-file config.guess 2004-03-12
diff --git a/debian/wormux-data.docs b/debian/warmux-data.docs
similarity index 100%
rename from debian/wormux-data.docs
rename to debian/warmux-data.docs
diff --git a/debian/warmux-data.install b/debian/warmux-data.install
new file mode 100644
index 0000000..7e160f6
--- /dev/null
+++ b/debian/warmux-data.install
@@ -0,0 +1,2 @@
+usr/share/games/warmux
+usr/share/locale
diff --git a/debian/wormux-data.links b/debian/warmux-data.links
similarity index 54%
rename from debian/wormux-data.links
rename to debian/warmux-data.links
index 7a2dd19..ac70ed5 100644
--- a/debian/wormux-data.links
+++ b/debian/warmux-data.links
@@ -1,3 +1,3 @@
-usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/games/wormux/font/DejaVuSans.ttf
-usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf usr/share/games/wormux/font/VL-Gothic-Regular.ttf
-usr/share/fonts/truetype/wqy/wqy-microhei.ttc usr/share/games/wormux/font/wqy-microhei-lite.ttc
+usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/games/warmux/font/DejaVuSans.ttf
+usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf usr/share/games/warmux/font/VL-Gothic-Regular.ttf
+usr/share/fonts/truetype/wqy/wqy-microhei.ttc usr/share/games/warmux/font/wqy-microhei-lite.ttc
diff --git a/debian/warmux-servers.examples b/debian/warmux-servers.examples
new file mode 100644
index 0000000..f4e22a7
--- /dev/null
+++ b/debian/warmux-servers.examples
@@ -0,0 +1,2 @@
+tools/servers/game_server/warmux_server.conf
+tools/servers/index_server/warmux_index_server.conf
diff --git a/debian/warmux-servers.install b/debian/warmux-servers.install
new file mode 100644
index 0000000..3777cd9
--- /dev/null
+++ b/debian/warmux-servers.install
@@ -0,0 +1,2 @@
+usr/games/warmux-index-server
+usr/games/warmux-server
diff --git a/debian/warmux-servers.manpages b/debian/warmux-servers.manpages
new file mode 100644
index 0000000..15e2a9f
--- /dev/null
+++ b/debian/warmux-servers.manpages
@@ -0,0 +1,2 @@
+debian/manpages/warmux-index-server.6
+debian/manpages/warmux-server.6
diff --git a/debian/wormux.docs b/debian/warmux.docs
similarity index 100%
rename from debian/wormux.docs
rename to debian/warmux.docs
diff --git a/debian/warmux.install b/debian/warmux.install
new file mode 100644
index 0000000..ec61e62
--- /dev/null
+++ b/debian/warmux.install
@@ -0,0 +1,4 @@
+usr/games/warmux
+usr/share/applications
+usr/share/man
+usr/share/pixmaps/warmux.xpm
diff --git a/debian/warmux.links b/debian/warmux.links
new file mode 100644
index 0000000..7221dcd
--- /dev/null
+++ b/debian/warmux.links
@@ -0,0 +1,3 @@
+usr/share/games/warmux/warmux_32x32.png usr/share/icons/hicolor/32x32/apps/warmux.png
+usr/share/games/warmux/warmux_128x128.png usr/share/icons/hicolor/128x128/apps/warmux.png
+usr/share/games/warmux/warmux.svg usr/share/icons/hicolor/scalable/apps/warmux.svg
diff --git a/debian/wormux.menu b/debian/warmux.menu
similarity index 50%
rename from debian/wormux.menu
rename to debian/warmux.menu
index 4b0a229..b866649 100644
--- a/debian/wormux.menu
+++ b/debian/warmux.menu
@@ -1,7 +1,7 @@
-?package(wormux): \
+?package(warmux): \
 	needs="X11" \
 	section="Games/Action"\
-	icon="/usr/share/pixmaps/wormux.xpm" \
-	title="Wormux" \
+	icon="/usr/share/pixmaps/warmux.xpm" \
+	title="WarMUX" \
 	longtitle="A 2D game where funny characters launch funny weapons" \
-	command="/usr/games/wormux"
+	command="/usr/games/warmux"
diff --git a/debian/wormux-data.install b/debian/wormux-data.install
deleted file mode 100644
index 9d815ee..0000000
--- a/debian/wormux-data.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/games/wormux
-usr/share/locale
diff --git a/debian/wormux-servers.examples b/debian/wormux-servers.examples
deleted file mode 100644
index 82df790..0000000
--- a/debian/wormux-servers.examples
+++ /dev/null
@@ -1,2 +0,0 @@
-tools/servers/game_server/wormux_server.conf
-tools/servers/index_server/wormux_index_server.conf
diff --git a/debian/wormux-servers.install b/debian/wormux-servers.install
deleted file mode 100644
index aba5aff..0000000
--- a/debian/wormux-servers.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/games/wormux-index-server
-usr/games/wormux-server
diff --git a/debian/wormux-servers.manpages b/debian/wormux-servers.manpages
deleted file mode 100644
index 4e8fc4d..0000000
--- a/debian/wormux-servers.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/manpages/wormux-index-server.6
-debian/manpages/wormux-server.6
diff --git a/debian/wormux.install b/debian/wormux.install
deleted file mode 100644
index 17f46b5..0000000
--- a/debian/wormux.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/games/wormux
-usr/share/applications
-usr/share/man
-usr/share/pixmaps/wormux.xpm
diff --git a/debian/wormux.links b/debian/wormux.links
deleted file mode 100644
index 8c0f484..0000000
--- a/debian/wormux.links
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/games/wormux/wormux_32x32.png usr/share/icons/hicolor/32x32/apps/wormux.png
-usr/share/games/wormux/wormux_128x128.png usr/share/icons/hicolor/128x128/apps/wormux.png
-usr/share/games/wormux/wormux.svg usr/share/icons/hicolor/scalable/apps/wormux.svg

-- 
WarMUX PKG



More information about the Pkg-games-commits mailing list