[mupen64plus-input-sdl] 82/196: Merge commit 'debian/1.99.4-4' into experimental

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus-input-sdl.

commit 24fd56fd32b9b7e1e2985ecee7d419970a24785f
Merge: 8986dc4 069d175
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Oct 31 15:00:28 2011 +0100

    Merge commit 'debian/1.99.4-4' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/inputautocfg.patch

 debian/changelog | 228 +++++++++++++++++++++++++++++++------------------------
 debian/control   |   1 -
 debian/copyright |   2 +-
 debian/rules     |   6 --
 4 files changed, 129 insertions(+), 108 deletions(-)

diff --cc debian/changelog
index b3f3ab3,5ef1f19..86edba6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,19 +1,41 @@@
 +mupen64plus-input-sdl (1.99.4+32+18a45fa6df35-1) UNRELEASED; urgency=low
 +
 +  * New upstream snapshot from revision 18a45fa6df35302282e94752e8b4a7f43af39011
 +
 + -- Sven Eckelmann <sven at narfation.org>  Fri, 09 Sep 2011 09:57:42 +0200
 +
 +mupen64plus-input-sdl (1.99.4+30+02519b25976b-1) experimental; urgency=low
 +
 +  * New upstream snapshot from revision 02519b25976b988cfd40af19acf383da4bd8f92f
 +  * debian/control:
-     - Add virtual package libsdl-dev as alternative build dependency
 +    - Depend on mupen64plus-*-abi-2
 +    - Build-Depend on libmupen64plus-dev >= 1.99.4+77+8bb0e6b3ae3a-1
 +  * Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
 +  * debian/patches:
 +    - Remove upstream merged patches 2controllers-per-usb-device.patch,
 +      patches/inputautocfg.patch, mouse_sensitivity.patch,
 +      rewrite_makefile.patch
 +  * Update years in debian/copyright
 +  * Add debian/get-orig-source.sh for snapshots
 +
 + -- Sven Eckelmann <sven at narfation.org>  Mon, 29 Aug 2011 17:05:38 +0200
 +
+ mupen64plus-input-sdl (1.99.4-4) unstable; urgency=low
+ 
+   * debian/control:
+     - Add virtual package libsdl-dev as alternative build dependency
+   * Don't mix implicit and explicit rules to prevent FTBFS with make
+     3.82
+   * Remove hardening-includes which are now integrated in dpkg-
+     buildflags
+   * Use debian packaging manual URL as format identifier in
+     debian/copyright
+   * debian/patches:
+     - Update inputautocfg.patch using new InputAutoCfg.ini from
+       mercurial
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Mon, 31 Oct 2011 12:49:00 +0100
+ 
  mupen64plus-input-sdl (1.99.4-3) unstable; urgency=low
  
    * Upload to unstable
diff --cc debian/control
index 4f36c8b,907dbcc..1a7095b
--- a/debian/control
+++ b/debian/control
@@@ -11,8 -11,7 +11,7 @@@ Vcs-Browser: http://anonscm.debian.org/
  Build-Depends:
   debhelper (>= 8.1.3),
   dpkg-dev (>= 1.16.0),
-  hardening-includes,
 - libmupen64plus-dev,
 + libmupen64plus-dev (>= 1.99.4+77+8bb0e6b3ae3a),
   libsdl1.2-dev | libsdl-dev,
  
  Package: mupen64plus-input-sdl

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-input-sdl.git