[mupen64plus-video-arachnoid] 80/147: Merge tag 'debian/1.99.4+38+4c27074013b8-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-arachnoid.

commit 1a7fa55c0cf5fdb59d43a2baba7e7ce3b8c0db96
Merge: 7c78e31 906a0ec
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Mar 11 19:53:22 2012 +0100

    Merge tag 'debian/1.99.4+38+4c27074013b8-1'
    
    Debian release 1.99.4+38+4c27074013b8-1
    
    Conflicts:
    	debian/changelog

 debian/changelog                         |  20 +++
 debian/control                           |   4 +-
 debian/get-orig-source.sh                |  26 ++++
 debian/patches/array_bounds.patch        |  18 ---
 debian/patches/mipmapping.patch          | 125 ----------------
 debian/patches/rewrite_makefile.patch    | 240 -------------------------------
 debian/patches/series                    |   3 -
 debian/rules                             |   5 +-
 projects/msvc9/GraphicsPlugin.vcproj     |   2 +
 projects/unix/Makefile                   | 142 +++++++++++-------
 src/Assembler/assembler.h                |  38 ++---
 src/Combiner/AdvancedCombinerManager.cpp |  58 ++++++++
 src/Combiner/AdvancedTexEnvCombiner.cpp  |  49 ++++++-
 src/Combiner/AdvancedTexEnvCombiner.h    |  46 ------
 src/Combiner/CombinerBase.cpp            |   2 -
 src/Combiner/CombinerStructs.h           |  57 --------
 src/FogManager.cpp                       |   3 +-
 src/GBI/GBIDefs.h                        |  37 ++---
 src/GraphicsPlugin.cpp                   |  15 +-
 src/Memory.cpp                           |  44 +-----
 src/Memory.h                             |   5 -
 src/MultiTexturingExt.cpp                |   3 +-
 src/OpenGLManager.h                      |   4 -
 src/RDP/RDP.h                            |   1 +
 src/RSP/RSP.cpp                          |   4 -
 src/RSP/RSP.h                            |   1 +
 src/RSP/RSPVertexManager.cpp             |   3 -
 src/RSP/RSPVertexManager.h               |   2 +-
 src/VI.cpp                               |   4 +-
 src/VI.h                                 |   9 +-
 src/config/Config.cpp                    |   2 +
 src/config/ConfigMap.h                   |   1 +
 src/config/StringFunctions.cpp           |   4 +-
 src/config/StringFunctions.h             |   2 +-
 src/framebuffer/FrameBuffer.cpp          |   6 +-
 src/hash/CRCCalculator.cpp               |   2 +-
 src/hash/CRCCalculator2.cpp              |   4 +-
 src/m64p.h                               |   1 +
 src/main.cpp                             |  45 +++++-
 src/math/MathLib.h                       |   1 -
 src/texture/TextureCache.cpp             |  48 +++++--
 src/texture/TextureCache.h               |   3 +
 src/ucodes/UCode0.cpp                    |   1 -
 src/ucodes/UCode1.cpp                    |   8 --
 src/ucodes/UCode2.cpp                    |  31 ++--
 src/ucodes/UCodeIdentificationData.h     | 135 -----------------
 src/ucodes/UCodeSelector.cpp             | 139 +++++++++++++++++-
 47 files changed, 545 insertions(+), 858 deletions(-)

diff --cc debian/changelog
index 9284c83,e15cc38..b2f789c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,23 +1,31 @@@
 +mupen64plus-video-arachnoid (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
 +
 + -- Sven Eckelmann <sven at narfation.org>  Sun, 01 Jan 2012 20:20:08 +0100
 +
+ mupen64plus-video-arachnoid (1.99.4+38+4c27074013b8-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision 4c27074013b88d687367c399b3ccb4c0ecf9878b
+   * Remove unnecessary --as-needed from linker flags in debian/rules
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sat, 12 Nov 2011 21:48:32 +0100
+ 
+ mupen64plus-video-arachnoid (1.99.4+33+6bb944b2f66e-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision 6bb944b2f66eb611972c5b8419341f8fcc886970
+   * debian/control:
+     - Depend on mupen64plus-*-abi-2
+     - Build-Depend on libmupen64plus-dev >= 1.99.4+77+8bb0e6b3ae3a-1
+   * debian/patches:
+     - Remove upstream merged patches array_bounds.patch, mipmapping.patch,
+       rewrite_makefile.patch
+   * Add debian/get-orig-source.sh for snapshots
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Mon, 29 Aug 2011 17:06:38 +0200
+ 
  mupen64plus-video-arachnoid (1.99.4-4) unstable; urgency=low
  
    * Don't mix implicit and explicit rules to prevent FTBFS with make
diff --cc debian/rules
index 01823f9,3fd63e1..b111df4
--- a/debian/rules
+++ b/debian/rules
@@@ -1,12 -1,12 +1,9 @@@
  #!/usr/bin/make -f
  # -*- makefile -*-
  
 -export CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 -export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
 -export CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
 -export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 +export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
  
  DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
- 
- LDFLAGS += -Wl,--as-needed
- 
  DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
  DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
  MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ LIBDIR="/usr/lib/$(DEB_HOST_MULTIARCH)" PIC=1 OPTFLAGS=""

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