[mupen64plus-video-glide64] 143/172: 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-glide64.

commit 7cb2b86e5ad9b87fce0acf7b967d1136176ce1c4
Merge: 48b1047 efc6989
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 5 09:16:19 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 |   6 +-
 debian/rules                      |  11 ++-
 projects/unix/Makefile            | 139 +++++++++++++++++++++++++-------------
 src/3dmath.cpp                    |   2 +
 src/Gfx1.3.h                      |   2 +-
 src/Main.cpp                      |  35 +++++-----
 src/m64p.h                        |   5 +-
 src/rdp.cpp                       |  37 +++++-----
 src/video_api_export.ver          |   1 +
 src/wrapper/3dfx.h                |   3 +
 src/wrapper/main.cpp              |   2 +-
 16 files changed, 212 insertions(+), 106 deletions(-)

diff --cc debian/changelog
index 7c46514,f78c952..70a9d56
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,55 +1,64 @@@
+ mupen64plus-video-glide64 (1.99.5+23+ecd597fb6dcf-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:00 +0200
+ 
+ mupen64plus-video-glide64 (1.99.5+23+ecd597fb6dcf-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
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sun, 23 Jun 2013 13:25:52 +0200
+ 
+ mupen64plus-video-glide64 (1.99.5+23+ecd597fb6dcf-1) experimental; urgency=low
+ 
+   * New Upstream Snapshot from ecd597fb6dcf8340f44832d3a28ea1716782375b
+   * Enable link-time optimization in debian/rules similar to upstream
+   * debian/patches:
+     - Rebase printf_fixup.patch on top of 1.99.5+23+ecd597fb6dcf
+   * 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:31 +0200
+ 
+ mupen64plus-video-glide64 (1.99.5+17+bfe79cebbe67-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision bfe79cebbe67cd6dd09bb78dfefce052deea4cd2
+   * Disable extra debug code in release builds with -DNDEBUG in
+     debian/rules
+   * debian/patches:
+     - Rebase printf_fixup.patch on top of 1.99.5+17+bfe79cebbe67
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Fri, 08 Feb 2013 10:16:27 +0100
+ 
+ mupen64plus-video-glide64 (1.99.5+2+c2c2d8f0161b-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision c2c2d8f0161b830a4adb3371d99e6179d7c4b227
+   * Remove obsolete DM-Upload-Allowed in debian/control
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sun, 02 Dec 2012 22:34:14 +0100
+ 
 +mupen64plus-video-glide64 (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:51:21 +0200
 +
  mupen64plus-video-glide64 (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-glide64.git