r4971 - in packages/trunk/xbattle/debian: . patches

[Barry deFreese]

Author: bddebian-guest
Date: 2007-12-16 18:41:25 +0000 (Sun, 16 Dec 2007)
New Revision: 4971

Added:
   packages/trunk/xbattle/debian/patches/02_imakefile_fix.patch
   packages/trunk/xbattle/debian/patches/03_parse_fix.patch
   packages/trunk/xbattle/debian/patches/04_manpage_fix.patch
Modified:
   packages/trunk/xbattle/debian/
   packages/trunk/xbattle/debian/changelog
   packages/trunk/xbattle/debian/control
   packages/trunk/xbattle/debian/patches/series
Log:
Add svn properties
  * Re-merge missed upstream source changes not in patches
    + 02_imakefile_fix.patch
    + 03_parse_fix.patch
    + 04_manpage_fix.patch
  * Add build-dep for libxext-dev



Property changes on: packages/trunk/xbattle/debian
___________________________________________________________________
Name: svn-bp:tagsUrl
   + svn+ssh://svn.debian.org/svn/pkg-games/packages/tags/xbattle
Name: svn-bp:origUrl
   + http://pkg-games.alioth.debian.org/tarballs/xbattle_5.4.1.orig.tar.gz
Name: mergeWithUpstream
   + 1

Modified: packages/trunk/xbattle/debian/changelog
===================================================================
--- packages/trunk/xbattle/debian/changelog	2007-12-16 14:16:57 UTC (rev 4970)
+++ packages/trunk/xbattle/debian/changelog	2007-12-16 18:41:25 UTC (rev 4971)
@@ -1,3 +1,14 @@
+xbattle (5.4.1-15) UNRELEASED; urgency=low
+
+  [ Barry deFreese ]
+  * Re-merge missed upstream source changes not in patches
+    + 02_imakefile_fix.patch
+    + 03_parse_fix.patch
+    + 04_manpage_fix.patch
+  * Add build-dep for libxext-dev
+
+ -- Barry deFreese <bddebian at comcast.net>  Sun, 16 Dec 2007 08:26:03 -0500
+
 xbattle (5.4.1-14) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/xbattle/debian/control
===================================================================
--- packages/trunk/xbattle/debian/control	2007-12-16 14:16:57 UTC (rev 4970)
+++ packages/trunk/xbattle/debian/control	2007-12-16 18:41:25 UTC (rev 4971)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bddebian at comcast.net>
-Build-Depends: debhelper (>= 5), quilt, libx11-dev, x-dev, xutils
+Build-Depends: debhelper (>= 5), quilt, libx11-dev, x-dev, xutils, libxext-dev
 Standards-Version: 3.7.3
 Vcs-Svn: ssh://svn.debian.org/svn/pkg-games/packages/trunk/xbattle/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/xbattle/?op=log

Added: packages/trunk/xbattle/debian/patches/02_imakefile_fix.patch
===================================================================
--- packages/trunk/xbattle/debian/patches/02_imakefile_fix.patch	                        (rev 0)
+++ packages/trunk/xbattle/debian/patches/02_imakefile_fix.patch	2007-12-16 18:41:25 UTC (rev 4971)
@@ -0,0 +1,16 @@
+diff -urN xbattle-5.4.1.orig.orig/Imakefile xbattle-5.4.1.orig/Imakefile
+--- xbattle-5.4.1.orig.orig/Imakefile	1995-10-17 10:14:37.000000000 -0400
++++ xbattle-5.4.1.orig/Imakefile	2007-12-16 08:17:23.000000000 -0500
+@@ -7,9 +7,9 @@
+ #endif
+ #endif
+ 
+-        DEFINES = -DDEFAULT_XBO_DIR=\"/export/home/lesher/xbos\" \
+-                  -DDEFAULT_XBT_DIR=\"/export/home/lesher/xbts\" \
+-                  -DDEFAULT_XBA_DIR=\"/export/home/lesher/xbas\"
++        DEFINES = -DDEFAULT_XBO_DIR=\"/usr/lib/games/xbattle/xbos\" \
++                  -DDEFAULT_XBT_DIR=\"/usr/lib/games/xbattle/xbts\" \
++                  -DDEFAULT_XBA_DIR=\"/usr/lib/games/xbattle/xbas\"
+ LOCAL_LIBRARIES = $(XLIB)
+   SYS_LIBRARIES = -lm
+            SRCS =	command.c		\

Added: packages/trunk/xbattle/debian/patches/03_parse_fix.patch
===================================================================
--- packages/trunk/xbattle/debian/patches/03_parse_fix.patch	                        (rev 0)
+++ packages/trunk/xbattle/debian/patches/03_parse_fix.patch	2007-12-16 18:41:25 UTC (rev 4971)
@@ -0,0 +1,13 @@
+diff -urN xbattle-5.4.1.orig.orig/parse.c xbattle-5.4.1.orig/parse.c
+--- xbattle-5.4.1.orig.orig/parse.c	1995-12-19 17:26:39.000000000 -0500
++++ xbattle-5.4.1.orig/parse.c	2007-12-16 08:19:22.000000000 -0500
+@@ -1486,8 +1486,7 @@
+        *filename;
+ {
+   int i;
+-  char *suffix,
+-       *strstr();
++  char *suffix;
+   FILE *fp;
+ 
+   strcpy (filename, &option[1]);

Added: packages/trunk/xbattle/debian/patches/04_manpage_fix.patch
===================================================================
--- packages/trunk/xbattle/debian/patches/04_manpage_fix.patch	                        (rev 0)
+++ packages/trunk/xbattle/debian/patches/04_manpage_fix.patch	2007-12-16 18:41:25 UTC (rev 4971)
@@ -0,0 +1,15 @@
+diff -urN xbattle-5.4.1.orig.orig/xbattle.man xbattle-5.4.1.orig/xbattle.man
+--- xbattle-5.4.1.orig.orig/xbattle.man	1995-12-19 17:58:48.000000000 -0500
++++ xbattle-5.4.1.orig/xbattle.man	2007-12-16 08:21:46.000000000 -0500
+@@ -1,9 +1,9 @@
+-.TH XBATTLE 5.4.1 "December 1995"
++.TH XBATTLE 6 "December 1995" 5.4.1
+ .SH NAME
+ xbattle \- a multi-user battle strategy game
+ .SH SYNOPSIS
+   xbattle [-<color> <display>...] [-<option> <argument>...]
+-.SH
++.SH DESCRIPTION
+ 
+ Assign a  team color and  display to  each  player,  and any number of
+ options  with argument where required.  <color>   can  be a monochrome

Modified: packages/trunk/xbattle/debian/patches/series
===================================================================
--- packages/trunk/xbattle/debian/patches/series	2007-12-16 14:16:57 UTC (rev 4970)
+++ packages/trunk/xbattle/debian/patches/series	2007-12-16 18:41:25 UTC (rev 4971)
@@ -1 +1,4 @@
 01_pseudo_color.patch
+02_imakefile_fix.patch
+03_parse_fix.patch
+04_manpage_fix.patch