[SCM] Packaging for bzflag branch, master, updated. debian/2.4.2+ds1-1
Ryan Kavanagh
rak at debian.org
Wed Aug 1 18:41:38 UTC 2012
The following commit has been merged in the master branch:
commit 54d8ff504079126de59bc94fc247a848d4580fb7
Author: Ryan Kavanagh <rak at debian.org>
Date: Tue Jul 31 13:18:29 2012 -0400
Drop all patches, they were applied upstream.
diff --git a/debian/patches/01_man_hyphens_as_minus.diff b/debian/patches/01_man_hyphens_as_minus.diff
deleted file mode 100644
index 2e63afc..0000000
--- a/debian/patches/01_man_hyphens_as_minus.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-Description: Don't use hyphens as minus signs
-Author: Ryan Kavanagh <rak at debian.org>
-Origin: vendor
-Forwarded: no
-Last-Update: 2012-07-20
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: bzflag/man/bzflag.6.in
-===================================================================
---- bzflag.orig/man/bzflag.6.in 2012-07-20 09:33:04.964915077 -0400
-+++ bzflag/man/bzflag.6.in 2012-07-20 09:33:48.413130525 -0400
-@@ -108,8 +108,8 @@
- stdout.txt on windows
- .TP
- .B \-echoAnsi
--Copies all message window output like -echo preserving the ANSI
--color coding on *nix, same as -echo on windows.
-+Copies all message window output like \-echo preserving the ANSI
-+color coding on *nix, same as \-echo on windows.
- .TP
- \fB\-latitude\fI latitude\fR
- Uses \fIlatitude\fR when computing celestial object positions.
-Index: bzflag/man/bzfs.6.in
-===================================================================
---- bzflag.orig/man/bzfs.6.in 2012-07-18 21:11:34.199862820 -0400
-+++ bzflag/man/bzfs.6.in 2012-07-20 09:35:58.837777255 -0400
-@@ -132,7 +132,7 @@
- .B \-advertise \fIgroupname,groupname,...\fR
- Allows control of who can see this server on the server list.
- Use: \fB\-advertise NONE\fR to make a private server (no one will see the
--server, but global logins can be used). The default, if -advertise is not
-+server, but global logins can be used). The default, if \-advertise is not
- specified, is to allow everyone to see the server.
- Otherwise, your server will only be listed to members of
- the groups which you specify, eg: \fB\-advertise JOE,BOB\fR.
-@@ -515,7 +515,7 @@
- Also anounces those players that stop the runs of good players.
- .TP
- \fB\-ts \fR[\fImicros\fR]
--Include timestamp information in DEBUG output - useful for logging.
-+Include timestamp information in DEBUG output \(em useful for logging.
- If \fImicros\fR is specified, microseconds will be added to the timestamp.
- .TP
- \fB\-userdb \fIfile\fR
-@@ -1113,7 +1113,7 @@
-
- GROUP_NAME: +perm1 +perm2
- .br
--GROUP_NAME: +perm3 +perm4 -perm5
-+GROUP_NAME: +perm3 +perm4 \-perm5
-
- Group names cannot have spaces, quotes, or other special characters in
- them. This would be a sample line defining a "cop" group:
-@@ -1128,7 +1128,7 @@
- Probably you want to define customized permissions for the default
- group "VERIFIED" instead of those automatically asigned by the server:
-
--VERIFIED: -ALL +perm1 +perm2 ...
-+VERIFIED: \-ALL +perm1 +perm2 ...
-
- Or you want to disable the /poll command entirely?
-
-Index: bzflag/man/bzw.5.in
-===================================================================
---- bzflag.orig/man/bzw.5.in 2012-07-18 21:11:34.199862820 -0400
-+++ bzflag/man/bzw.5.in 2012-07-20 09:38:15.506454973 -0400
-@@ -355,7 +355,7 @@
- .br
- \fB emission\fR 0.0 0.0 0.0 1.0 # emission color
- .br
--\fB shininess\fR 0.0 # shininess (0.0 - 128.0)
-+\fB shininess\fR 0.0 # shininess (0.0 \(en 128.0)
- .br
- \fB texture\fR filename # set working texture
- .br
-@@ -820,7 +820,7 @@
- OnSpawn, for player spawn events.
- OnDie, for player death events.
- If the weapon is to be triggered only for a specific team then the eventteam option should be used with a team number (1 to 4).
--A eventteam value of -1 will trigger this weapon for any team. -1 is the default eventteam value.
-+A eventteam value of \-1 will trigger this weapon for any team. \-1 is the default eventteam value.
-
- \fBweapon\fR
- .br
diff --git a/debian/patches/02_man_adjust_line.diff b/debian/patches/02_man_adjust_line.diff
deleted file mode 100644
index 96482c5..0000000
--- a/debian/patches/02_man_adjust_line.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix un-adjusting line
- W: bzflag-server: manpage-has-errors-from-man usr/share/man/man6/bzfs.6.gz 55: warning [p 1, 3.0i]: cannot adjust line
-Author: Ryan Kavanagh <rak at debian.org>
-Origin: vendor
-Forwarded: no
-Last-Update: 2012-07-22
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: bzflag/man/bzfs.6.in
-===================================================================
---- bzflag.orig/man/bzfs.6.in 2012-07-22 12:11:13.087459311 -0400
-+++ bzflag/man/bzfs.6.in 2012-07-22 12:47:03.918124704 -0400
-@@ -52,7 +52,7 @@
- [\fB\-lagwarn \fR\fImilliseconds\fR]
- [\fB\-masterBanURL \fIURL\fR]
- [\fB\-maxidle \fR\fIseconds\fR]
--[\fB\-mp \fR{\fIcount\fR|[\fIrogue\-count\fR]\fB,\fR[\fIred\-count\fR]\fB,\fR[\fIgreen\-count\fR]\fB,\fR[\fIblue\-count\fR]\fB,\fR[\fIpurple\-count\fR],\fR[\fIobserver\-count\fR]}]
-+[\fB\-mp \fR{\fIcount\fR\~|\~[\fIrogue\-count\fR]\fB,\fR[\fIred\-count\fR]\fB,\fR[\fIgreen\-count\fR]\fB,\fR[\fIblue\-count\fR]\fB,\fR[\fIpurple\-count\fR],\fR[\fIobserver\-count\fR]}]
- [\fB\-mps \fR\fImax\-score\fR]
- [\fB\-ms \fIshots\fR]
- [\fB\-mts \fR\fImax\-score\fR]
diff --git a/debian/patches/03_no_debiandir_touching.diff b/debian/patches/03_no_debiandir_touching.diff
deleted file mode 100644
index ba6ff18..0000000
--- a/debian/patches/03_no_debiandir_touching.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Don't let upstream touch stuff in Debian/ during build
- Upstream distributes a debian/ directory and touches stuff within it during
- build time. We've deleted files upstream uses inside of it (Makefile.in,
- Makefile.am, buildsnap, etc), some of which were being updated at build time.
- Upstream touching anything under debian/ is a bad idea in general, so lets make
- sure that doesn't happen.
-Author: Ryan Kavanagh <rak at debian.org>
-Origin: vendor
-Forwarded: no
-Last-Update: 2012-07-22
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: bzflag/configure.ac
-===================================================================
---- bzflag.orig/configure.ac 2012-07-22 17:15:48.204624274 -0400
-+++ bzflag/configure.ac 2012-07-22 17:21:14.794243740 -0400
-@@ -1150,7 +1150,6 @@
- data/Makefile
- data/fonts/Makefile
- data/l10n/Makefile
-- debian/Makefile
- include/Makefile
- m4/Makefile
- man/Makefile
-Index: bzflag/Makefile.am
-===================================================================
---- bzflag.orig/Makefile.am 2012-07-22 17:15:48.208624291 -0400
-+++ bzflag/Makefile.am 2012-07-22 17:22:04.530490371 -0400
-@@ -20,7 +20,6 @@
-
- DIST_SUBDIRS = \
- $(traversal_dirs) \
-- debian \
- m4 \
- misc \
- plugins \
-@@ -64,22 +63,9 @@
- m4/lt~obsolete.m4
- # delete files from m4 subdirectory here to prevent dependency problems
-
--.PHONY: package debian-svn debian-release
--
- package:
- cd package && $(MAKE) targets
-
--debian-svn: dist
-- -rm -rf $(distdir)
-- GZIP=$(GZIP_ENV) $(AMTAR)$(TAR) zxf $(distdir).tar.gz
-- (cd $(distdir) && debian/buildsnap svn)
--
--debian-release: debian/changelog dist
-- -rm -rf $(distdir)
-- GZIP=$(GZIP_ENV) $(AMTAR)$(TAR) zxf $(distdir).tar.gz
-- cp debian/changelog $(distdir)/debian/
-- (cd $(distdir) && debian/buildsnap release)
--
- # make sure all files are in the repository are also in the dist.
- # make sure files that should not be in the distribution in fact are
- # not included.
diff --git a/debian/patches/series b/debian/patches/series
index 058d5f0..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-01_man_hyphens_as_minus.diff
-02_man_adjust_line.diff
-03_no_debiandir_touching.diff
--
Packaging for bzflag
More information about the Pkg-games-commits
mailing list