[mupen64plus-rsp-z64] 84/140: Merge tag 'debian/1.99.4+31+1374ffc147ad-1'

[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 8b0b8ffeb26de8a81a11449aead8f82b807882e5
Merge: 11d10fd 856c629
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Mar 11 12:33:06 2012 +0100

    Merge tag 'debian/1.99.4+31+1374ffc147ad-1'
    
    Debian release 1.99.4+31+1374ffc147ad-1
    
    Conflicts:
    	debian/changelog

 debian/changelog                      |  23 +++-
 debian/control                        |   4 +-
 debian/get-orig-source.sh             |  26 ++++
 debian/patches/dma_transfer.patch     |  76 ------------
 debian/patches/hle_compat.patch       | 131 --------------------
 debian/patches/rewrite_makefile.patch | 220 ----------------------------------
 debian/patches/series                 |   3 -
 debian/rules                          |   2 +-
 projects/unix/Makefile                | 162 +++++++++++++++----------
 src/main_rsp.cpp                      |  48 +++++---
 src/rsp.cpp                           | 102 +++-------------
 src/rsp.h                             |   3 +-
 src/rsp_opinfo.cpp                    |   3 +-
 src/rsp_recomp.cpp                    |  20 ++--
 14 files changed, 209 insertions(+), 614 deletions(-)

diff --cc debian/changelog
index 23194e0,b222344..27b5091
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,24 +1,33 @@@
- mupen64plus-rsp-z64 (1.99.4-6) UNRELEASED; urgency=low
++mupen64plus-rsp-z64 (1.99.4+31+1374ffc147ad-2) UNRELEASED; urgency=low
 +
 +  * Update copyright years in debian/copyright
 +  * Enable all hardening flags in debian/rules
 +  * Upgraded to policy 3.9.3, no changes required
 +  * Upgrade debhelper compat to v9
 +
 + -- Sven Eckelmann <sven at narfation.org>  Sun, 01 Jan 2012 20:19:55 +0100
 +
+ mupen64plus-rsp-z64 (1.99.4+31+1374ffc147ad-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision 1374ffc147add410b62a30e88f88191c0dfa90c2
+   * debian/patches:
+     - Remove upstream merged patch dma_transfer.patch and hle_compat.patch
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sat, 12 Nov 2011 21:44:39 +0100
+ 
+ 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-
diff --cc debian/control
index b6a1222,95e203f..82c3d61
--- a/debian/control
+++ b/debian/control
@@@ -9,9 -9,9 +9,9 @@@ Homepage: http://code.google.com/p/mupe
  Vcs-Git: git://anonscm.debian.org/collab-maint/mupen64plus-rsp-z64.git
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-rsp-z64.git
  Build-Depends:
 - debhelper (>= 8.1.3),
 + debhelper (>= 9),
   dpkg-dev (>= 1.16.0),
-  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