The following commit has been merged in the master branch:
commit c85844ebd40b617cacfd4ab38403b6b78491926e
Author: Barry deFreese <[email protected]>
Date: Mon Jan 4 12:31:15 2010 -0500
Incorporate NMU changes into git, refresh changelog, bump standards version.
diff --git a/debian/changelog b/debian/changelog
index 1caf050..32deb0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,24 @@ warsow (0.42.dfsg1-2) unstable; urgency=low
[ Andres Mejia ]
* Use git for packaging.
* Include DM-Upload-Allowed: yes field.
+ * Remove myself from uploaders.
- -- Andres Mejia <[email protected]> Mon, 19 May 2008 16:16:18 -0400
+ [ Barry deFreese ]
+ * Add myself to uploaders.
+ * Bump Standards Version to 3.8.3.
+
+ -- Barry deFreese <[email protected]> Mon, 04 Jan 2010 12:29:50 -0500
+
+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 <[email protected]> Tue, 07 Jul 2009 21:08:35 -0500
warsow (0.42.dfsg1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9abc161..d9959e8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: warsow
Section: contrib/games
Priority: optional
Maintainer: Debian Games Team <[email protected]>
-Uploaders: Gonéri Le Bouder <[email protected]>, Bruno "Fuddl" Kleinert
<[email protected]>
+Uploaders: Gonéri Le Bouder <[email protected]>, Bruno "Fuddl" Kleinert
<[email protected]>, Barry deFreese <[email protected]>
Build-Depends: debhelper (>= 5), quilt, tofrodos, sharutils, libopenal-dev,
libjpeg-dev, libvorbis-dev, libsdl-dev, libz-dev, libxxf86vm-dev,
libxxf86dga-dev, libxinerama-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
Homepage: http://www.warsow.net/
Vcs-Git: git://git.debian.org/git/pkg-games/warsow.git
Vcs-Browser: http://git.debian.org/?p=pkg-games/warsow.git
diff --git a/debian/rules b/debian/rules
index ce54e59..1531747 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,30 +20,31 @@ endif
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 @@ clean-patched:
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 @@ binary-arch: build install
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 --git a/debian/scripts/warsow b/debian/scripts/warsow
index cc9503f..5137436 100755
--- a/debian/scripts/warsow
+++ b/debian/scripts/warsow
@@ -33,7 +33,7 @@ QUIET=0
case "$1" in
-h|--help)
- echo -e ${HELP}
+ printf "${HELP}"
exit 1
;;
-q|--quiet)
diff --git a/debian/scripts/warsow-server b/debian/scripts/warsow-server
index 3ad3fe3..9c58d48 100755
--- a/debian/scripts/warsow-server
+++ b/debian/scripts/warsow-server
@@ -31,7 +31,7 @@ Usage: warsow-server [OPTION] [+<internal command> <option>
[<value>]] ...\n\
case "$1" in
-h|--help)
- echo -e ${HELP}
+ printf "${HELP}"
exit 1
;;
esac
diff --git a/debian/scripts/warsowtv-server b/debian/scripts/warsowtv-server
index f4004a8..e417183 100755
--- a/debian/scripts/warsowtv-server
+++ b/debian/scripts/warsowtv-server
@@ -30,7 +30,7 @@ Usage: warsow-server [OPTION] [+<internal command> <option>
[<value>]] ...\n\
case "$1" in
-h|--help)
- echo -e ${HELP}
+ printf "${HELP}"
exit 1
;;
esac
--
Packaging for warsow
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
