[mupen64plus-rsp-z64] 71/140: 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-rsp-z64.

commit 12f333796212a6f008a00d765ab2c8e2a20b39f1
Merge: 9837edd bcf536b
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Sep 9 10:25:03 2011 +0200

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

 debian/changelog | 12 ++++++++++++
 debian/control   |  6 ++++++
 debian/rules     | 12 +++++++++---
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 19483bb,63c991a..ef2c8cc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,14 +1,34 @@@
 -mupen64plus-rsp-z64 (1.99.4-4) unstable; urgency=low
 +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-4) unstable; urgency=low
++
+   * debian/patches:
+     - Add dma_transfer.patch, Fix DMA transfer parameter decoding
+     - Add hle_compat.patch, Added a macro for using HLE RSP video/audio
+       emulation
+   * Build hle video version of mupen64plus-video-z64 in debian/rules
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Fri, 09 Sep 2011 10:11:51 +0200
+ 
  mupen64plus-rsp-z64 (1.99.4-3) unstable; urgency=low
  
    * Upload to unstable
diff --cc debian/control
index 0e60f4b,431a816..2e6586a
--- a/debian/control
+++ b/debian/control
@@@ -22,7 -22,9 +22,9 @@@ Pre-Depends
  Depends:
   ${misc:Depends},
   ${shlibs:Depends},
 - mupen64plus-rsp-abi-1,
 + mupen64plus-rsp-abi-2,
+ Provides:
+  mupen64plus-rsp,
  Description: low-level rsp emulation for mupen64plus
   N64 Reality Signal Processor instruction level emulation for graphics plugins
   supporting preprocessed vertex information. It can emulate even unknown or
diff --cc debian/rules
index d10610a,e8956e7..10a8788
--- a/debian/rules
+++ b/debian/rules
@@@ -26,13 -26,19 +26,19 @@@ binary binary-arch binary-indep build b
  	dh $@ --sourcedirectory="projects/unix" --parallel --list-missing
  
  get-orig-source:
 -	uscan --verbose --force-download
 +	$(CURDIR)/debian/get-orig-source.sh
  
  override_dh_auto_build:
- 	dh_auto_build -- all $(MAKEOPTIONS)
+ 	dh_auto_build -- all $(MAKEOPTIONS) HLEVIDEO=0
+ 	dh_auto_build -- all $(MAKEOPTIONS) HLEVIDEO=1
  
  override_dh_auto_install:
- 	dh_auto_install -- $(MAKEOPTIONS)
+ 	dh_auto_install -- $(MAKEOPTIONS) HLEVIDEO=0
+ 	dh_auto_install -- $(MAKEOPTIONS) HLEVIDEO=1
+ 
+ override_dh_auto_clean:
+ 	dh_auto_clean -- $(MAKEOPTIONS) HLEVIDEO=0
+ 	dh_auto_clean -- $(MAKEOPTIONS) HLEVIDEO=1
  
  override_dh_strip:
  	dh_strip -a --dbg-package="$(DBG_PACKAGE)"

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