[mupen64plus-video-z64] 132/161: 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-video-z64.

commit 2f8523279672e4849e79545698270929c9893b39
Merge: 3691ebc 0aaa969
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 5 09:16:20 2013 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/rules

 .hg_archival.txt                  |   5 --
 .hgignore                         |   4 --
 .hgtags                           |   2 -
 debian/changelog                  |  52 ++++++++++++++
 debian/control                    |  12 ++--
 debian/patches/printf_fixup.patch |   2 +-
 debian/patches/sdl2_compat.patch  |  20 ++++++
 debian/patches/series             |   1 +
 debian/rules                      |  11 ++-
 projects/unix/Makefile            | 147 +++++++++++++++++++++++++-------------
 src/glshader.cpp                  |  14 +++-
 src/maingl.cpp                    |  14 ++--
 src/rgl.cpp                       |   2 +-
 src/rgl.h                         |   8 ++-
 src/rgl_debugger.cpp              |   2 +-
 src/rgl_geometry.cpp              |   2 +-
 src/rgl_glut.cpp                  |   2 +-
 src/rgl_osdep.cpp                 |   5 +-
 src/rgl_rendermode.cpp            |   2 +-
 src/rgl_tiles.cpp                 |   2 +-
 src/video_api_export.ver          |   1 +
 21 files changed, 227 insertions(+), 83 deletions(-)

diff --cc debian/changelog
index 2887d5a,b5a4046..a7daab1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,55 +1,64 @@@
+ mupen64plus-video-z64 (1.99.5+24+f331e66fc630-3) 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_{clean,test} behavior
+       which is causing a FTBFS by adding an explicit
+       override_dh_auto_{clean,test} rule
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Wed, 26 Jun 2013 12:30:01 +0200
+ 
+ mupen64plus-video-z64 (1.99.5+24+f331e66fc630-2) experimental; urgency=low
+ 
+   * debian/rules:
+     - Switch from SDL 1.2 to SDL 2.0
+   * debian/control:
+     - Depend on libsdl2-dev instead of libsdl1.2-dev
+     - Add Break for pre-SDL2 libmupen64plus2
+   * debian/patches:
+     - Add sdl2_compat.patch, Add missing name when creating thread with SDL2
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sun, 23 Jun 2013 13:26:39 +0200
+ 
+ mupen64plus-video-z64 (1.99.5+24+f331e66fc630-1) experimental; urgency=low
+ 
+   * New Upstream Snapshot from f331e66fc630f5a83f0be01fdb2ed87a1c433ccb
+   * Enable link-time optimization in debian/rules similar to upstream
+   * debian/control:
+     - Depend on mupen64plus-vidext-abi-3
+     - Depend on mupen64plus-gfx-abi-2.2
+     - Depend on mupen64plus-dev >= 1.99.5+207+cbb5cbe2d4fc
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Wed, 05 Jun 2013 13:26:59 +0200
+ 
+ mupen64plus-video-z64 (1.99.5+18+7c782be6fc7c-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision 7c782be6fc7c59ce333dcaa040e128e1dea478c7
+   * Disable extra debug code in release builds with -DNDEBUG in
+     debian/rules
+   * debian/patches:
+     - Rebase printf_fixup.patch on top of 1.99.5+18+7c782be6fc7c
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Fri, 08 Feb 2013 10:16:50 +0100
+ 
+ mupen64plus-video-z64 (1.99.5+4+ee66eddb472a-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision ee66eddb472a3dcfa5558df95352bf9c78d1aa29
+   * Remove obsolete DM-Upload-Allowed in debian/control
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sun, 02 Dec 2012 22:34:28 +0100
+ 
 +mupen64plus-video-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:29:38 +0200
 +
  mupen64plus-video-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-video-z64.git