[SCM] SDL-Port of Wolfenstein 3-D and Spear of Destiny branch, master, updated. debian/1.7-1-22-gc9a06dc

[Jon Dowland]

The following commit has been merged in the master branch:
commit c9a06dc919a2264246ed74dd3135f4296e79a24a
Author: Jon Dowland <jmtd at debian.org>
Date:   Tue Nov 29 14:10:10 2011 +0000

    apply uploaded changes
    
    I sponsored the package upload and made a small number of tweaks:
    
     • watch file: strip out 'dfsg' suffixes
     • bump standards version

diff --git a/debian/changelog b/debian/changelog
index 56f5256..b96ee43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 wolf4sdl (1.7+svn262+dfsg1-1) unstable; urgency=low
 
+  [ Fabian Greffrath ]
   * Imported Upstream version 1.7+svn262+dfsg1
   * Add debian/README.source and document the removal of the
     MAME OPL2 emulator sources.
@@ -12,7 +13,11 @@ wolf4sdl (1.7+svn262+dfsg1-1) unstable; urgency=low
   * Remove debian/patches/32-mingw.patch, applied upstream.
   * Remove another compiler warning in 21-compiler-warnings.patch.
 
- -- Fabian Greffrath <fabian+debian at greffrath.com>  Tue, 11 Oct 2011 08:29:59 +0200
+  [ Jon Dowland ]
+  * Bump standards version.
+  * Tweak watch file to exclude '+dfsg1' from versions.
+
+ -- Jon Dowland <jmtd at debian.org>  Mon, 28 Nov 2011 13:32:28 +0000
 
 wolf4sdl (1.7-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7ae548f..6fca58a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Fabian Greffrath <fabian+debian at greffrath.com>, Jon Dowland <jmtd at deb
 Build-Depends: debhelper (>= 7.0.50~),
  libsdl1.2-dev,
  libsdl-mixer1.2-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://www.chaos-software.de.vu/
 Vcs-Git: git://git.debian.org/git/pkg-games/wolf4sdl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/wolf4sdl.git;a=summary
diff --git a/debian/watch b/debian/watch
index 7d0972f..52e2a55 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
+opts=dversionmangle=s/\+dfsg1// \
 http://www.alice-dsl.net/mkroll/downloads.html \
 bins/Wolf4SDL-([\d\.]*)-src\.zip

-- 
SDL-Port of Wolfenstein 3-D and Spear of Destiny