[SCM] Packaging for bzflag branch, master, updated. upstream/2.0.16-61-g70bed9d

[Ryan Kavanagh]

The following commit has been merged in the master branch:
commit 8ed4c01d3c0f102d72ebed7a577f7ca958a09418
Author: Ryan Kavanagh <rak at debian.org>
Date:   Sun Jul 22 17:26:19 2012 -0400

    Don't let upstream modify debian/ at build time (03_no_debiandir_touching.diff)

diff --git a/debian/patches/03_no_debiandir_touching.diff b/debian/patches/03_no_debiandir_touching.diff
new file mode 100644
index 0000000..ba6ff18
--- /dev/null
+++ b/debian/patches/03_no_debiandir_touching.diff
@@ -0,0 +1,59 @@
+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 5cd7765..058d5f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_man_hyphens_as_minus.diff
 02_man_adjust_line.diff
+03_no_debiandir_touching.diff

-- 
Packaging for bzflag