[SCM] Installer for game data files branch, master, updated. 9a22aec866a8dc73feef874d80adec400f2ce565

[Jon Dowland]

The following commit has been merged in the master branch:
commit 9a22aec866a8dc73feef874d80adec400f2ce565
Author: Jon Dowland <jmtd at debian.org>
Date:   Thu Jul 14 14:53:06 2011 +0100

    protect against accidentally packaging non-free .deb files

diff --git a/debian/changelog b/debian/changelog
index b80f997..020a998 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-game-data-packager (29) UNRELEASED; urgency=low
+game-data-packager (29) unstable; urgency=low
 
+  [ Simon McVittie ]
   * Allow Quake mission packs to have any of several known md5sums
     - add new function verify_md5sum_alternatives, and a regression test
   * Allow Quake 1.01 CDs' LHA archives to contain upper-case filenames
@@ -8,7 +9,12 @@ game-data-packager (29) UNRELEASED; urgency=low
     which the corresponding .desktop files can use as their TryExec field
     to hide uninstalled mission packs
 
- -- Simon McVittie <smcv at debian.org>  Thu, 14 Jul 2011 09:07:30 +0100
+  [ Jon Dowland ]
+  * remove any ./*deb files in clean.  They might be left behind if one
+    was created in a branch, and someone switches branches before running
+    clean.
+
+ -- Jon Dowland <jmtd at debian.org>  Thu, 14 Jul 2011 14:37:26 +0100
 
 game-data-packager (28) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index da91fdf..e06e81a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ clean:
 	rm -f build-stamp configure-stamp
 	$(MAKE) clean VERSION=$(VERSION)
 	dh_clean
+	rm -f *.deb
 
 install: build
 	dh_testdir

-- 
Installer for game data files