Bug#530221: warsow: diff for NMU version 0.42.dfsg1-1.1
Raphael Geissert
geissert at debian.org
Wed Jul 8 02:51:54 UTC 2009
tags 530220 + patch
tags 530221 + patch
thanks
Dear maintainer,
I've prepared an NMU for warsow (versioned as 0.42.dfsg1-1.1) and
uploaded it to DELAYED/4. Please free to tell me if I should
delay it longer.
Regards.
diff -u warsow-0.42.dfsg1/debian/changelog warsow-0.42.dfsg1/debian/changelog
--- warsow-0.42.dfsg1/debian/changelog
+++ warsow-0.42.dfsg1/debian/changelog
@@ -1,3 +1,14 @@
+warsow (0.42.dfsg1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix bashisms in wrappers. Closes: #530220, #530221
+ * Remove useless nostrip check in rules, dh_strip does this already
+ * Fix parallel building
+ * Fix rules file targets mess
+ + fix_different_archs.diff still doesn't unapply cleanly
+
+ -- Raphael Geissert <geissert at debian.org> Tue, 07 Jul 2009 21:08:35 -0500
+
warsow (0.42.dfsg1-1) unstable; urgency=low
[ Andres Mejia ]
diff -u warsow-0.42.dfsg1/debian/rules warsow-0.42.dfsg1/debian/rules
--- warsow-0.42.dfsg1/debian/rules
+++ warsow-0.42.dfsg1/debian/rules
@@ -20,30 +20,31 @@
UNAME_ARCH=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
# This is used convert files to be patched from dos to unix EOL convention.
-from-dos:
+from-dos-stamp:
dh_testdir
fromdos -e warsow_0.42_src/source/game/q_shared.h
fromdos -e warsow_0.42_src/source/client/cl_main.c
- touch fromdos-stamp
+ touch $@
-patch: from-dos patch-stamp
-patch-stamp:
+patch: patch-stamp
+patch-stamp: from-dos-stamp
dh_testdir
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
touch patch-stamp
-build: patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: patch
dh_testdir
cd warsow_0.42_src/source && $(MAKE) LOCALBASE=/usr DEBUG_BUILD=$(DEBUG) \
CC=$(DEB_HOST_GNU_TYPE)-gcc LD=$(DEB_HOST_GNU_TYPE)-gcc
touch build-stamp
-clean: clean-patched unpatch to-dos
-clean-patched:
+clean:
dh_testdir
dh_testroot
cd warsow_0.42_src/source && $(MAKE) clean
+ # source directory needs to be cleaned before removing the patches
+ $(MAKE) -f $(CURDIR)/debian/rules unpatch
rm -rf warsow_0.42_src/source/build warsow_0.42_src/source/release \
warsow_0.42_src/source/build$(UNAME_ARCH) \
warsow_0.42_src/source/build$(DPKG_ARCH)
@@ -52,17 +53,17 @@
dh_clean
[ ! -f build-stamp ] || rm build-stamp
-unpatch:
+unpatch: to-dos
dh_testdir
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
- rm -f patch-stamp
+ rm -fr patch-stamp .pc
# Reverses from-dos target
to-dos:
dh_testdir
todos -e warsow_0.42_src/source/game/q_shared.h
todos -e warsow_0.42_src/source/client/cl_main.c
- [ ! -f fromdos-stamp ] || rm fromdos-stamp
+ [ ! -f from-dos-stamp ] || rm from-dos-stamp
install: build
dh_testdir
@@ -89,9 +90,7 @@
dh_installman -pwarsow debian/warsow.6
dh_installman -pwarsow-server debian/warsow-server.6 \
debian/warsowtv-server.6
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip
-endif
dh_compress
dh_fixperms
dh_installdeb
diff -u warsow-0.42.dfsg1/debian/scripts/warsow-server warsow-0.42.dfsg1/debian/scripts/warsow-server
--- warsow-0.42.dfsg1/debian/scripts/warsow-server
+++ warsow-0.42.dfsg1/debian/scripts/warsow-server
@@ -31,7 +31,7 @@
case "$1" in
-h|--help)
- echo -e ${HELP}
+ printf "${HELP}"
exit 1
;;
esac
diff -u warsow-0.42.dfsg1/debian/scripts/warsow warsow-0.42.dfsg1/debian/scripts/warsow
--- warsow-0.42.dfsg1/debian/scripts/warsow
+++ warsow-0.42.dfsg1/debian/scripts/warsow
@@ -33,7 +33,7 @@
case "$1" in
-h|--help)
- echo -e ${HELP}
+ printf "${HELP}"
exit 1
;;
-q|--quiet)
diff -u warsow-0.42.dfsg1/debian/scripts/warsowtv-server warsow-0.42.dfsg1/debian/scripts/warsowtv-server
--- warsow-0.42.dfsg1/debian/scripts/warsowtv-server
+++ warsow-0.42.dfsg1/debian/scripts/warsowtv-server
@@ -30,7 +30,7 @@
case "$1" in
-h|--help)
- echo -e ${HELP}
+ printf "${HELP}"
exit 1
;;
esac
reverted:
--- warsow-0.42.dfsg1/.pc/.version
+++ warsow-0.42.dfsg1.orig/.pc/.version
@@ -1 +0,0 @@
-2
More information about the Pkg-games-devel
mailing list