--- Begin Message ---
Package: matanza
Version: 0.13-3.2
Severity: important
Please find attched the interdiff file.
Aníbal Monsalve Salazar
--
http://v7w.com/anibal
interdiff -z -p1 ../matanza_0.13-3.1.diff.gz ../matanza_0.13-3.2.diff.gz
diff -u matanza-0.13/debian/changelog matanza-0.13/debian/changelog
--- matanza-0.13/debian/changelog
+++ matanza-0.13/debian/changelog
@@ -1,3 +1,21 @@
+matanza (0.13-3.2) unstable; urgency=low
+
+ * Non-maintainer upload fixing lots of bugs (Closes: #335274)
+ * Use debhelper compatability version 5
+ * Revamp and modernize debian/rules, uses debhelper more
+ * Add homepage to the long description
+ * Update the manual page and refer users to the README (Closes: #340496)
+ * Move binaries to /usr/games
+ * Bump Standards-Version
+ * Make sure to rebuild matanza.c and ai.c (build-dep on tetex-bin)
+ * Build-depend on libpng12-dev
+ * Update copyright information, including FSF address
+ * Recommend the virtual package telnet-client as well
+ * Install NEWS/TODO and the example ships, map and config
+ * Use $(MAKE) instead of make
+
+ -- Paul Wise <[EMAIL PROTECTED]> Mon, 24 Apr 2006 12:28:41 +0800
+
matanza (0.13-3.1) unstable; urgency=low
* NMU
diff -u matanza-0.13/debian/rules matanza-0.13/debian/rules
--- matanza-0.13/debian/rules
+++ matanza-0.13/debian/rules
@@ -1,67 +1,60 @@
#!/usr/bin/make -f
-package=matanza
-tempdir=$(shell pwd)/debian/tmp
-insdirs=$(tempdir)/$(package)/DEBIAN \
- $(tempdir)/$(package)/usr/bin \
- $(tempdir)/$(package)/usr/share/doc/$(package) \
- $(tempdir)/$(package)/usr/share/man/man1 \
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
-binary: binary-indep binary-arch
-
-binary-arch: debian/control checkroot build $(insdirs)
- install -m 644 debian/matanza.1 $(tempdir)/$(package)/usr/share/man/man1
- install -m 644 debian/matanza-ai.1
$(tempdir)/$(package)/usr/share/man/man1
- install -s -m 755 matanza $(tempdir)/$(package)/usr/bin
- install -s -m 755 matanza-ai $(tempdir)/$(package)/usr/bin
-
- install -m 644 debian/changelog
$(tempdir)/$(package)/usr/share/doc/$(package)/changelog.Debian
- find $(tempdir)/$(package)/usr/share/doc -type f | xargs -r gzip -v9
- install -m 644 debian/copyright
$(tempdir)/$(package)/usr/share/doc/$(package)
- install -m 644 README
$(tempdir)/$(package)/usr/share/doc/$(package)/README
- install -m 644 debian/README.Debian
$(tempdir)/$(package)/usr/share/doc/$(package)/README.Debian
- rm -f config.status && rm -f config.log && rm -f config.cache
- find $(tempdir)/$(package)/usr/share/man -type f | xargs -r gzip -v9
- dh_fixperms
- dh_perl
- dh_installdeb -P$(tempdir)/$(package)
- dpkg-shlibdeps -p$(package) matanza
- dpkg-gencontrol -isp -P$(tempdir)/$(package) -p$(package)
- dpkg --build $(tempdir)/$(package) ..
-
-binary-indep: debian/control checkroot build $(insdirs)
-
-build: debian/control
- ./configure
- make
- touch build
-
-checkroot: debian/control
- test "root" = "$(shell whoami)"
-
-clean: debian/control
- make -i clean
- make -i distclean
- for i in build debian/files debian/substvars `find -name "*~"`; do \
- if [ -e $$i ]; then \
- rm -f $$i; \
- fi; \
- done
- for i in $(tempdir); do \
- if [ -d $$i ]; then \
- rm -rf $$i; \
- fi; \
- done
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+ cp -f /usr/share/misc/config.sub .
+ cp -f /usr/share/misc/config.guess .
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --bindir=/usr/games
+ $(MAKE) CFLAGS="$(CFLAGS)"
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ -[ -f Makefile ] && make distclean
+ rm -f matanza.c ai.c config.sub config.guess build-stamp
dh_clean
-$(insdirs):
- if [ -d $@ ]; then \
- rm -rf $@; \
- fi
- install -d -m 755 $@
- chmod g-s $@
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/matanza
+
+binary: binary-indep binary-arch
+binary-indep: install
+binary-arch: install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
-.PHONY: binary binary-arch binary-indep checkroot clean
+.PHONY: build clean install binary binary-arch binary-indep
#Local variables:
#mode: makefile
diff -u matanza-0.13/debian/matanza.1 matanza-0.13/debian/matanza.1
--- matanza-0.13/debian/matanza.1
+++ matanza-0.13/debian/matanza.1
@@ -1,74 +1,48 @@
-.TH "Matanza" 1
+.TH "matanza" 1
.SH NAME
-Matanza \- space war multiuser ascii game
+matanza \- space war multiuser ascii game
.SH SYNOPSIS
-.B Matanza
-matanza [--help] [--version]
+.B matanza [OPTIONS]
.SH DESCRIPTION
Matanza is a multiplayer game. In it, every player controls a ship cruising
in space, aiming to destroy the other players (and, eventually, ships
-controled by the computer).
+controled by the computer). You connect to the server using a telnet client.
.RS
.SH OPTIONS
.TP
-.B
The first thing you must do is connect to the server.
-You must connect to
-the TCP port `7993' (unless you specified a different port when you ran the
+You must connect to the TCP port `7993' (unless you specified a different port
when you ran the server) of the host running the server.
.TP
-.B
-server) of the host running the server.
-I won't tell you how to do this,
-Luke.
+I won't tell you how to do this, Luke.
.PP
Umm.
.PP
Don't look at me like that!
.TP
-.B
Ok, you win.
-It's probably `telnet localhost 7993'.
+It's probably 'telnet localhost 7993'.
.PP
-Once connected, you'll see some nice (c'mon give us some credits)
+Once connected, you'll see some nice (c'mon give us some credits) introduction.
.TP
-.B
-introduction.
-You must hit <RET> (that's <Enter>) to go to the game's main
-screen.
+You must hit <RET> (that's <Enter>) to go to the game's main screen.
.TP
-.B
At the main screen, you must enter your name.
-That's right, it can't have
-.TP
-.B
-more than 8 letters.
+That's right, it can't have more than 8 letters.
Oh, and it can not begin with a number. Enter your
name and hit <RET> a few times.
.PP
-If you are in Windows' stupid telnet client, the widgets there will look
-.TP
-.B
-awful.
+If you are in Windows' stupid telnet client, the widgets there will look awful.
No colors or anything. We are going to fix that eventually, but\.\.\.
-.TP
-.B
well, you'll have to learn to live with that for the moment.
I'm sure you
-.TP
-.B
can, Luke.
After all, you could stand it when that stupid kid at school
used to beat you, remember?
.TP
-.B
But back to our game, you'll see a ship in the middle of screen.
Yes, I
-.TP
-.B
said ship.
Okay, I know it looks more like fire effects than a ship, but
-.TP
-.B
with a couple of practice it's going to look better.
You just need to train
your self to recognize it.
@@ -76,235 +50,228 @@
Or you could think of it as a big moth and of the bullets as moth-spit and
the goal of this game would be to cover your enemies in your spit.
.TP
-.B
Now, that thing in the middle of the screen is YOUR ship.
To control it you
can use the following keys:
.TP
.B
-`h' and `l': Make the ship rotate.
+\`h' and `l'
+.B Make the ship rotate.
If you are wondering why I used `h' and
-.RS
-.TP
-.B
`l', get a life (in other words, learn to use Vi).
It's a matter of
-.TP
-.B
style.
Actually, I got so many complaints from lukes like you that I
added support for arrow keys.
-.RE
-.PP
-`+' and `-': These allow you to zoom in and out.
.TP
.B
-`j' and `k': Accelerate the ship.
-Yes, it can move! Yes, at different
-.RS
+\`+' and `-'
+These allow you to
+.B zoom in and out.
.TP
.B
+\`j' and `k'
+.BAccelerate the ship.
+Yes, it can move! Yes, at different
speeds!
Okay, `j' may not work (see --brake and --fly-back). More on
-.TP
-.B
that latter.
Again, arrows key works as well.
.RE
.TP
.B
-` ' (that's space, dude): Shot.
+` ' (that's space, dude)
+.B Shot.
Yay! Bullets! Or (depending on your point
-.RS
-.TP
-.B
of view) Moth-Spit!
Sorry, dude, the telnet protocol doesn't support
sound so there's no BZZZING when you shot.
.RE
.TP
.B
-`b': Shot bullets backwards.
+\`b'
+.B Shot bullets backwards.
Sometimes this doesn't work. More on that in
section 6.
.TP
.B
-`m': Do you see two little imperfections on your ship's wings?
+\`m'
+Do you see two little imperfections on your ship's wings?
Those are
-.RS
-.TP
-.B
-the MISSILES.
-You can shot them with `m'. They do a lot more damage
+the
+.B MISSILES.
+Yoy can
+.B shot them with `m'.
+They do a lot more damage
than the bullets, but you have only two, so be careful.
.RE
.TP
.B
-`n': You can also shot SMALLER missiles.
+`n'
+You can also shot SMALLER missiles.
You have ten of these.
-.PP
-<Ret>: If you hit <Ret>, you'll be able to write a message to send it to all
-.RS
.TP
-.B
+.B <Ret>
+If you hit <Ret>, you'll be able to write a message to send it to all
the other players.
That's correct, you can use Matanza as a full
-.TP
-.B
featured chat and all.
You could even have net.sex using it, but don't
even get me started on the subject.
.RE
-.PP
-`z': Shows you stats about the game.
-.PP
-`c': Removes the last message from the list of messages.
-.PP
-`C': Cleans the list of messages.
-.PP
-`s': Swaps the position of the list of messages.
-.PP
-`p': Pauses the game.
.TP
.B
-`v': Toggles whether or not you see the messages.
+\`z'
+Shows you stats about the game.
+.RE
+.TP
+.B
+`c'
+Removes the last message from the list of messages.
+.RE
+.TP
+.B
+`C'
+Cleans the list of messages.
+.RE
+.TP
+.B
+`s'
+Swaps the position of the list of messages.
+.RE
+.TP
+.B
+`p'
+Pauses the game.
+.RE
+.TP
+.B
+`v'
+Toggles whether or not you see the messages.
Sometimes you'll want to
disable them.
.TP
.B
-`i': Make your ship invisible!
+`i'
+Make your ship invisible!
But beware, you may only make it invisible
for a short period of time, after that it becomes visible again and you
can't become invisible anymore.
-.PP
-`q': Quit the game.
-.PP
+.RE
+.TP
+.B
+`q'
+Quit the game.
+.RE
+.TP
The following is a list of important command line arguments; this was last
updated for version 0.12, though some are still missing.
-.PP
+.RE
+.TP
+.B
--help
This shows the list of command line arguments and exits.
-.PP
+.RE
+.TP
+.B
--version
Use this to know the version of the server.
-.PP
+.RE
+.TP
+.B
--max-players=NUM
If you want to make it so the server will allow at most NUM players to
enter the world at any given moment, use this option.
-.PP
---bold
-This instructs the server to use bold characters when rendering images to
-.RS
+.RE
.TP
.B
+--bold
+This instructs the server to use bold characters when rendering images to
ASCII art.
It improves the quality of the rendering (as of version 0.9
it still has some bugs).
.RE
-.PP
---imgwidth=NUM
-.RS
.TP
.B
+--imgwidth=NUM
This changes the default image width (for the zoom).
The default is 320.
.RE
-.PP
---health=NUM
-Use this option to set the maximum damage a ship can take before it is
-.RS
.TP
.B
+--health=NUM
+Use this option to set the maximum damage a ship can take before it is
destroyed.
It defaults to 1000.
.RE
-.PP
---mapsize-x=NUM
---mapsize-y=NUM
-.RS
.TP
.B
+--mapsize-x=NUM --mapsize-y=NUM
These options allow you to change the map size.
If you make it smaller,
-.TP
-.B
players will come across each other more often.
On the other hand, if
you plan to have a lot of players, you might want to increase the size.
The default is 1200 x 1000.
.RE
-.PP
+.TP
+.B
--lives=NUM
With this option you can change the number of lives each player (or team:
see --no-share) gets at startup.
-.PP
---angles=NUM
-During its initialization, Matanza calculates rotations for all its
-.RS
+.RE
.TP
.B
+--angles=NUM
+During its initialization, Matanza calculates rotations for all its
images (ships, missiles, asteroids, etc.).
It uses 64 different angles
-.TP
-.B
by default.
You may change this number to increase its quality or
decrease its memory consumption.
.RE
-.PP
---no-chat
-.RS
.TP
.B
+--no-chat
If you use this option, you will disallow the chat feature.
The only
reason I can think why someone would want to do that would be to keep
newbies from entering the chat buffer and becoming unable to control
-.TP
-.B
their ships.
Or perhaps to make some team games more exciting by
preventing the players to exchange information (though I know it would be
very easy to cheat).
.RE
-.PP
---team=STR
-If you want to play in teams mode, you will use this option once for
-.RS
.TP
.B
+--team=STR
+If you want to play in teams mode, you will use this option once for
every team, specifing its name.
Before joining the game, all players
must select the team they will play in.
.RE
-.PP
+.TP
+.B
--password[=STR]
You can instruct the server to only accept players who know the password.
This might be good for some tournaments.
-.PP
---teams-safe
-.RS
+.RE
.TP
.B
+--teams-safe
This option is only meaningful in teams mode.
By default, bullets from a
-.TP
-.B
given player hurt everyone, not only players from the other teams.
This
option changes that behaviour and makes it so bullets from a given player
won't hurt players in the same team.
.RE
-.PP
---no-share
-.RS
.TP
.B
+--no-share
This option is only meaningful in teams mode.
By default, all the teams
have a pool of lives; when a player dies, he comes back to play and the
-.TP
-.B
team has one life less.
When this option is specified, the lives are no
longer shared so each player has its own pool of lives.
@@ -313,30 +280,34 @@
.B
--ang-speed-max=NUM
Maximum angular speed for ships (try 0)
-.PP
+.RE
+.TP
+.B
--fly-back
If this option is specified, players will be acelerate backwards.
-.PP
+.RE
+.TP
+.B
--brake
Players will be able to brake using `j' (or the down arrow).
-.PP
+.RE
+.TP
+.B
--air
Ships' speed depend on their direction.
-.PP
---speed-max=NUM
-.RS
+
+.RE
.TP
.B
+--speed-max=NUM
Set the maximum speed for the ships to NUM.
A value of 0 makes this
unlimited.
.RE
-.PP
---asteroids=NUM
-With this option you can specify how many asteroids you want at a given
-.RS
.TP
.B
+--asteroids=NUM
+With this option you can specify how many asteroids you want at a given
moment.
If you use `0', you will disable this feature and the memory
requirements will decrease.
@@ -345,6 +316,7 @@
.B
--limits
Give the world limits; make it end
+.RE
.TP
.B
--no-radar
@@ -354,56 +326,46 @@
--invisible=NUM
Allow players to become invisible for NUM rounds
-.PP
---ppc=NUM
-.RS
+.RE
.TP
.B
+--ppc=NUM
PPC stands for Players Per Connection.
With this option, you will be
-.TP
-.B
able to set the number of ships each connection will have.
For the
-.TP
-.B
moment, the only supported values are 1 and 2.
The keyboard bindings
change and those for a value of 2 are not yet documented.
.RE
-.PP
---bg=PATH
-.RS
.TP
.B
+--bg=PATH
PATH should be the path to a JPEG file.
Matanza will load the
information in the file and use it as the background, rather than showing
-.TP
-.B
the dots.
This will only work if libjpeg was installed when you compiled
Matanza.
.RE
-.PP
---mapsize-img
-.RS
.TP
.B
+--mapsize-img
This option will be ignored unless `--bg' is also used.
It tells Matanza
to set the map's size to be the width and height of the background image.
When used, the options `-x' and `-y' are ignored.
.RE
-.PP
---ship-img=FILE
-Through this option you can specify a file name for Matanza to load the
-.RS
.TP
.B
+--ship-img=FILE
+Through this option you can specify a file name for Matanza to load the
images for the ships from it.
The format for the file is very simple,
consult ship.txt for more details.
.SH "SEE ALSO"
-telnet
+.P
+Please read the extensive README file for more documentation.
+.P
+telnet(1)
.SH BUGS
Alejandro Forero Cuervo <[EMAIL PROTECTED]>
diff -u matanza-0.13/debian/control matanza-0.13/debian/control
--- matanza-0.13/debian/control
+++ matanza-0.13/debian/control
@@ -5,11 +5,13 @@
-Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 5), autotools-dev, tetex-bin, libpng12-dev
+Standards-Version: 3.7.2
Package: matanza
Architecture: any
-Depends: libpng12-0
-Recommends: telnet | telnet-ssl | inetutils-telnet | putty
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: telnet | telnet-ssl | inetutils-telnet | putty | telnet-client
Description: Space ascii war game
Matanza is a multiplayer game. In it, every player controls a ship cruising
in space, aiming to destroy the other players (and, eventually, ships
controled by the computer).
+ .
+ Homepage: http://bachue.com/matanza/
diff -u matanza-0.13/debian/matanza-ai.1 matanza-0.13/debian/matanza-ai.1
--- matanza-0.13/debian/matanza-ai.1
+++ matanza-0.13/debian/matanza-ai.1
@@ -1,8 +1,8 @@
.TH "Matanza-ai" 1
.SH NAME
-Matanza-ai \- Execute a Matanza Artificial Inteligence from FILE
+matanza-ai \- Execute a Matanza Artificial Inteligence from FILE
.SH SYNOPSIS
-.B Matanza-ai
+.B matanza-ai
matanza-ai [-help] [-version]
.SH DESCRIPTION
Execute a Matanza Artificial Inteligence from FILE
only in patch2:
unchanged:
--- matanza-0.13.orig/debian/copyright
+++ matanza-0.13/debian/copyright
@@ -1,13 +1,18 @@
This package was debianized by Polkan Alexis Garcia Rodriguez <[EMAIL
PROTECTED]> on
Mon, 28 Jun 2004 15:19:37 -0500.
-It was downloaded from
http://freshmeat.net/redir/matanza/6227/url_tgz/matanza-0.13.tar.gz
+It was downloaded from http://bachue.com/matanza/
-Upstream Author: Alejandro Forero Cuervo <[EMAIL PROTECTED]>
+Author:
-This package has many utilities that are GPL or close to GPL code.
+ Alejandro Forero Cuervo <[EMAIL PROTECTED]>
-Copyright (C) 1998,1999,2000,2001,2002,2003,2004 Craig Small <[EMAIL
PROTECTED]>
+Copyright:
+
+ Copyright (C) 1999, 2000 Alejandro Forero Cuervo
+ Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+
+Licence:
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,8 +26,8 @@
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
only in patch2:
unchanged:
--- matanza-0.13.orig/debian/docs
+++ matanza-0.13/debian/docs
@@ -0,0 +1,3 @@
+NEWS
+README
+TODO
only in patch2:
unchanged:
--- matanza-0.13.orig/debian/watch
+++ matanza-0.13/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://bachue.com/matanza/matanza-([\d.]*)\.tar\.gz debian uupdate
only in patch2:
unchanged:
--- matanza-0.13.orig/debian/manpages
+++ matanza-0.13/debian/manpages
@@ -0,0 +1,2 @@
+debian/matanza.1
+debian/matanza-ai.1
only in patch2:
unchanged:
--- matanza-0.13.orig/debian/compat
+++ matanza-0.13/debian/compat
@@ -0,0 +1 @@
+5
only in patch2:
unchanged:
--- matanza-0.13.orig/debian/examples
+++ matanza-0.13/debian/examples
@@ -0,0 +1,4 @@
+matanza.xml
+ship.txt
+shiptank.txt
+maze.png
signature.asc
Description: Digital signature
--- End Message ---
