[mupen64plus-rsp-z64] 76/140: Merge commit 'debian/1.99.4-5' 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-rsp-z64.

commit 1e23d1b49227a541a695a78786a3c67af9351795
Merge: 12f3337 c92cacf
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Oct 31 15:06:44 2011 +0100

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

 debian/changelog | 215 ++++++++++++++++++++++++++++++-------------------------
 debian/control   |   1 -
 debian/copyright |   2 +-
 debian/rules     |   6 --
 4 files changed, 120 insertions(+), 104 deletions(-)

diff --cc debian/changelog
index ef2c8cc,b3a2ebc..32c863a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,16 +1,37 @@@
 +mupen64plus-rsp-z64 (1.99.4+29+61f0779c9b15-1) UNRELEASED; urgency=low
 +
 +  * New upstream snapshot from revision 61f0779c9b15fa8552b8c91c7fe0dd4227d07826
 +  * debian/patches:
 +    - Remove upstream merged patch dma_transfer.patch and hle_compat.patch
 +
 + -- Sven Eckelmann <sven at narfation.org>  Fri, 09 Sep 2011 10:02:32 +0200
 +
 +mupen64plus-rsp-z64 (1.99.4+26+121aa9960630-1) experimental; urgency=low
 +
 +  * New upstream snapshot from revision 121aa9960630695e10f903ffb7da37ff34247011
 +  * Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
 +  * debian/control:
 +    - Depend on mupen64plus-*-abi-2
 +    - Build-Depend on libmupen64plus-dev >= 1.99.4+77+8bb0e6b3ae3a-1
 +  * debian/patches:
 +    - Remove upstream merged patch rewrite_makefile.patch
 +  * Add debian/get-orig-source.sh for snapshots
 +
 + -- Sven Eckelmann <sven at narfation.org>  Mon, 29 Aug 2011 17:06:12 +0200
 +
+ mupen64plus-rsp-z64 (1.99.4-5) unstable; urgency=low
+ 
+   * 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:27 +0100
+ 
  mupen64plus-rsp-z64 (1.99.4-4) unstable; urgency=low
  
+   * Don't mix implicit and explicit rules to prevent FTBFS with make
+     3.82
    * debian/patches:
      - Add dma_transfer.patch, Fix DMA transfer parameter decoding
      - Add hle_compat.patch, Added a macro for using HLE RSP video/audio
diff --cc debian/control
index 2e6586a,0623e4f..95e203f
--- 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),
  
  Package: mupen64plus-rsp-z64
  Architecture: any-i386 any-amd64

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