[mupen64plus-rsp-z64] 116/140: Merge branch '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 c5d163067510d9dc949423e05d1148333feba495
Merge: 6c21f92 6cdef13
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 5 09:16:18 2013 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/rules

 .hg_archival.txt       |  5 ----
 .hgignore              |  4 ---
 .hgtags                |  2 --
 debian/changelog       | 33 ++++++++++++++++++++++++
 debian/control         |  2 +-
 debian/rules           |  8 ++++--
 projects/unix/Makefile | 70 +++++++++++++++++++++++++++++++-------------------
 7 files changed, 84 insertions(+), 40 deletions(-)

diff --cc debian/changelog
index ea4e5dc,71e1fa3..39ea26b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,36 +1,45 @@@
+ mupen64plus-rsp-z64 (1.99.5+15+5b238bb813d9-2) UNRELEASED; urgency=low
+ 
+   * debian/control:
+     - Build-Depend on debhelper 9.20130604 for support of parameters when
+       detecting targets in dh_auto_*
+   * debian/rules:
+     - Work around new debhelper 9.20130624 dh_auto_test behavior which is
+       causing a FTBFS by adding an explicit override_dh_auto_test rule
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Wed, 26 Jun 2013 12:29:59 +0200
+ 
+ mupen64plus-rsp-z64 (1.99.5+15+5b238bb813d9-1) experimental; urgency=low
+ 
+   * New Upstream Snapshot from 5b238bb813d9fd500b92fecd6a769b55bce977dd
+   * Enable link-time optimization in debian/rules similar to upstream
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Wed, 05 Jun 2013 13:25:50 +0200
+ 
+ mupen64plus-rsp-z64 (1.99.5+12+3ac880a8fb3e-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision 3ac880a8fb3eaf177968fd212f9936d61b8c3292
+   * Disable extra debug code in release builds with -DNDEBUG in
+     debian/rules
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Fri, 08 Feb 2013 10:15:53 +0100
+ 
+ mupen64plus-rsp-z64 (1.99.5+3+ee940659ff77-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision ee940659ff7720886049705ba417f679b94c6155
+   * Remove obsolete DM-Upload-Allowed in debian/control
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sun, 02 Dec 2012 22:32:33 +0100
+ 
 +mupen64plus-rsp-z64 (1.99.5-2) unstable; urgency=low
 +
 +  * Upload to unstable
 +  * Remove obsolete DM-Upload-Allowed in debian/control
 +  * Disable extra debug code in release builds with -DNDEBUG in
 +    debian/rules
 +
 + -- Sven Eckelmann <sven at narfation.org>  Sun, 05 May 2013 14:13:27 +0200
 +
  mupen64plus-rsp-z64 (1.99.5-1) experimental; urgency=low
  
    * New Upstream Version

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