[mupen64plus-rsp-hle] 82/167: 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 armhf_test
in repository mupen64plus-rsp-hle.

commit 21fef97f5addfdecd7a19d3e62c6b50342ad887c
Merge: 5687fc8 4c8cec7
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Oct 31 15:03:15 2011 +0100

    Merge commit 'debian/1.99.4-4' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/control

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

diff --cc debian/changelog
index 67b7c2e,c1a1bbd..c37b4c8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,16 +1,30 @@@
 +mupen64plus-rsp-hle (1.99.4+23+850d9527e48e-1) experimental; urgency=low
 +
 +  * New upstream snapshot from revision 850d9527e48eb08a9c2d57d97b68b79bef46940e
 +  * 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 big_endian_conflict.patch,
 +      endianness_xor.patch, rewrite_makefile.patch
 +  * Add debian/get-orig-source.sh for snapshots
 +
 + -- Sven Eckelmann <sven at narfation.org>  Mon, 29 Aug 2011 17:05:53 +0200
 +
+ mupen64plus-rsp-hle (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
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Mon, 31 Oct 2011 12:49:14 +0100
+ 
  mupen64plus-rsp-hle (1.99.4-3) unstable; urgency=low
  
    * Upload to unstable
diff --cc debian/control
index 3931c8d,71e3c94..e5dece0
--- 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-rsp-hle

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