[mupen64plus-video-arachnoid] 122/147: 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-arachnoid.

commit 89940231d60027e4061a22a6b8be84974b42f90c
Merge: 17c66cd 86169d9
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 5 09:16:17 2013 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/rules

 .hg_archival.txt                     |   5 --
 .hgignore                            |   4 --
 .hgtags                              |   2 -
 debian/changelog                     |  38 ++++++++++++
 debian/control                       |   8 +--
 debian/rules                         |  11 +++-
 projects/unix/Makefile               | 111 ++++++++++++++++++++++++-----------
 src/Assembler/assembler.h            |   2 +-
 src/Combiner/CombinerStageCreator.h  |   2 +-
 src/ExtensionChecker.h               |   2 +-
 src/GraphicsPlugin.cpp               |   2 +-
 src/OpenGL.h                         |   6 ++
 src/m64p.h                           |   1 +
 src/main.cpp                         |  18 +++++-
 src/osal_dynamiclib_win32.cpp        |   2 +-
 src/ucodes/UCode1.h                  |   2 +-
 src/ucodes/UCode10.h                 |   2 +-
 src/ucodes/UCode4.h                  |   2 +-
 src/ucodes/UCode7.h                  |   2 +-
 src/ucodes/UCodeIdentificationData.h |   2 +-
 src/utils/MemoryLeakDetector.h       |   6 +-
 src/video_api_export.ver             |   1 +
 22 files changed, 165 insertions(+), 66 deletions(-)

diff --cc debian/changelog
index fbf8447,42c0556..d19d9da
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,41 +1,50 @@@
+ mupen64plus-video-arachnoid (1.99.5+22+711f2d8cbdcd-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_{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-arachnoid (1.99.5+22+711f2d8cbdcd-1) experimental; urgency=low
+ 
+   * New Upstream Snapshot from 711f2d8cbdcd3bc1eb58891220494d411c5c3cdb
+   * 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:19 +0200
+ 
+ mupen64plus-video-arachnoid (1.99.5+17+d1dc3118f220-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision d1dc3118f220ee7c8beabe6224bd648143f1b01a
+   * Disable extra debug code in release builds with -DNDEBUG in
+     debian/rules
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Fri, 08 Feb 2013 10:16:16 +0100
+ 
+ mupen64plus-video-arachnoid (1.99.5+4+28e9cf4a672f-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision 28e9cf4a672fbba30f393a1c99990c9ed4f6817f
+   * Remove obsolete DM-Upload-Allowed in debian/control
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sun, 02 Dec 2012 22:34:08 +0100
+ 
 +mupen64plus-video-arachnoid (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:21:41 +0200
 +
  mupen64plus-video-arachnoid (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-arachnoid.git