[mupen64plus-video-z64] 83/161: Merge tag 'debian/1.99.4+29+901fe271524a-1'

[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 235f59eaebcffe95de94b87c3dfdbbf1c2f36819
Merge: b7a00cc ae8d13c
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Mar 11 20:06:04 2012 +0100

    Merge tag 'debian/1.99.4+29+901fe271524a-1'
    
    Debian release 1.99.4+29+901fe271524a-1
    
    Conflicts:
    	debian/changelog

 debian/changelog                      |  22 +++
 debian/control                        |   4 +-
 debian/get-orig-source.sh             |  26 ++++
 debian/patches/printf_fixup.patch     |  76 +---------
 debian/patches/rewrite_makefile.patch | 261 ----------------------------------
 debian/patches/series                 |   1 -
 debian/rules                          |   2 +-
 projects/unix/Makefile                | 191 +++++++++++++++----------
 src/maingl.cpp                        |  35 ++++-
 src/rdp.cpp                           |   5 +-
 src/rdp.h                             |   5 +-
 src/rgl.cpp                           |   6 +-
 src/rgl_debugger.cpp                  |   9 --
 src/rgl_geometry.cpp                  |  15 +-
 src/rgl_osdep.cpp                     |  23 +--
 src/rgl_rendermode.cpp                |  18 +--
 src/rgl_tiles.cpp                     |   2 +-
 17 files changed, 226 insertions(+), 475 deletions(-)

diff --cc debian/changelog
index 5f08699,52fee35..97b2f20
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,25 +1,34 @@@
 +mupen64plus-video-z64 (1.99.4-5) UNRELEASED; urgency=low
 +
 +  * Update copyright years in debian/copyright
 +  * Enable all hardening flags in debian/rules
 +  * Upgraded to policy 3.9.3, no changes required
 +  * Upgrade debhelper compat to v9
 +
 + -- Sven Eckelmann <sven at narfation.org>  Sun, 01 Jan 2012 20:20:26 +0100
 +
+ mupen64plus-video-z64 (1.99.4+29+901fe271524a-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision 901fe271524a2ba372f66552eb17af31316b8083
+   * debian/patches:
+     - Rebase printf_fixup.patch against 1.99.4+29+901fe271524a
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sat, 12 Nov 2011 21:50:14 +0100
+ 
+ mupen64plus-video-z64 (1.99.4+24+81f51799ae45-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision 81f51799ae4560b8a3b644ba992d0ddd747464ac
+   * debian/control:
+     - Depend on mupen64plus-*-abi-2
+     - Build-Depend on libmupen64plus-dev >= 1.99.4+77+8bb0e6b3ae3a-1
+   * Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
+   * debian/patches:
+     - Remove upstream merged patch rewrite_makefile.patch
+     - Rebase printf_fixup.patch against 1.99.4+24+81f51799ae45
+   * Add debian/get-orig-source.sh for snapshots
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Mon, 29 Aug 2011 17:07:17 +0200
+ 
  mupen64plus-video-z64 (1.99.4-4) unstable; urgency=low
  
    * debian/control:

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