tag 475635 patch
tag 333281 patch
thanks
Hi,
The following is the diff for my xsoldier 1:1.4-1.1 NMU.
diff -u xsoldier-1.4/debian/changelog xsoldier-1.4/debian/changelog
--- xsoldier-1.4/debian/changelog
+++ xsoldier-1.4/debian/changelog
@@ -1,3 +1,22 @@
+xsoldier (1:1.4-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/watch: Added.
+ * debian/rules:
+ + Remove DH_COMPAT, now in debian/compat and level 4
+ + Replaced deprecated chown call
+ + Pass CFLAGS and LDFLAGS to configure script
+ * Fix bashism in preinst (Closes: #475635)
+ * debian/postrm: also remove /var/games (if empty) on purge (Closes:
#333281)
+ * debian/control:
+ + Bump versioned debhelper version to 4
+ + x-dev -> x11proto-core-dev
+ + Remove versioned dependency on libsdl-image1.2-dev, satisfied in sarge
+ + Added ${misc:Depends}
+ * debian/menu: updated to new menu sections policy
+
+ -- Raphael Geissert <[EMAIL PROTECTED]> Tue, 01 Jul 2008 15:10:20 -0500
+
xsoldier (1:1.4-1) unstable; urgency=low
* New upstream release
diff -u xsoldier-1.4/debian/control xsoldier-1.4/debian/control
--- xsoldier-1.4/debian/control
+++ xsoldier-1.4/debian/control
@@ -2,12 +2,12 @@
Section: games
Priority: optional
Maintainer: Oohara Yuuma <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), libsdl1.2-dev, libsdl-image1.2-dev (>=
1.2.2-1), libx11-dev, libxpm-dev, x-dev
+Build-Depends: debhelper (>> 4.0.0), libsdl1.2-dev, libsdl-image1.2-dev,
libx11-dev, libxpm-dev, x11proto-core-dev
Standards-Version: 3.5.6
Package: xsoldier
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: shoot 'em up game with the "not shooting" bonus
You control a space ship in a vertically scrolling window and shoot
enemies. If you kill the boss enemy which appears at the end of each stage,
diff -u xsoldier-1.4/debian/postrm xsoldier-1.4/debian/postrm
--- xsoldier-1.4/debian/postrm
+++ xsoldier-1.4/debian/postrm
@@ -25,7 +25,7 @@
fi
if test -d /var/games/xsoldier/
then
- rmdir /var/games/xsoldier/ || true
+ rmdir -p /var/games/xsoldier/ || true
fi
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff -u xsoldier-1.4/debian/preinst xsoldier-1.4/debian/preinst
--- xsoldier-1.4/debian/preinst
+++ xsoldier-1.4/debian/preinst
@@ -26,7 +26,7 @@
fi
if test -d /var/lib/games/
then
- rmdir /var/lib/games/ &> /dev/null || true
+ rmdir /var/lib/games/ > /dev/null 2>&1|| true
fi
;;
diff -u xsoldier-1.4/debian/rules xsoldier-1.4/debian/rules
--- xsoldier-1.4/debian/rules
+++ xsoldier-1.4/debian/rules
@@ -5,15 +5,13 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- ./configure --prefix=/usr --bindir=/usr/games \
- --localstatedir=/var --mandir=/usr/share/man --with-sdl
+ CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \
+ --prefix=/usr --bindir=/usr/games \
+ --localstatedir=/var --mandir=/usr/share/man --with-sdl
touch configure-stamp
@@ -32,7 +30,7 @@
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
@@ -78,7 +76,7 @@
dh_strip
dh_compress
dh_fixperms
- chown root.games $(CURDIR)/debian/xsoldier/usr/games/xsoldier
+ chown root:games $(CURDIR)/debian/xsoldier/usr/games/xsoldier
chmod 2755 $(CURDIR)/debian/xsoldier/usr/games/xsoldier
# dh_makeshlibs
dh_installdeb
diff -u xsoldier-1.4/debian/xsoldier.menu xsoldier-1.4/debian/xsoldier.menu
--- xsoldier-1.4/debian/xsoldier.menu
+++ xsoldier-1.4/debian/xsoldier.menu
@@ -1,3 +1,3 @@
?package(xsoldier):command="/usr/games/xsoldier" needs="X11" \
- section="Games/Arcade" title="XSoldier" \
+ section="Games/Action" title="XSoldier" \
icon="/usr/share/games/xsoldier/xsoldier.xpm"
only in patch2:
unchanged:
--- xsoldier-1.4.orig/debian/compat
+++ xsoldier-1.4/debian/compat
@@ -0,0 +1 @@
+4
\ No newline at end of file
only in patch2:
unchanged:
--- xsoldier-1.4.orig/debian/watch
+++ xsoldier-1.4/debian/watch
@@ -0,0 +1,4 @@
+version=3
+
+http://www.interq.or.jp/libra/oohara/xsoldier/xsoldier-(.+)\.tar\.gz
+
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
