[mupen64plus-input-sdl] 91/196: Merge tag 'debian/1.99.4+35+db912fcfb862-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-input-sdl.

commit db0d3d484635b4d47878197dad5960b36de2bb18
Merge: 2431aab a285241
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Mar 11 11:56:38 2012 +0100

    Merge tag 'debian/1.99.4+35+db912fcfb862-1'
    
    Debian release 1.99.4+35+db912fcfb862-1
    
    Conflicts:
    	debian/changelog

 README                                           |  64 +++++--
 data/InputAutoCfg.ini                            | 165 +++++++++++++++-
 debian/changelog                                 |  23 +++
 debian/control                                   |   4 +-
 debian/copyright                                 |   4 +-
 debian/get-orig-source.sh                        |  26 +++
 debian/patches/2controllers-per-usb-device.patch |  31 ---
 debian/patches/inputautocfg.patch                | 231 -----------------------
 debian/patches/mouse_sensitivity.patch           | 126 -------------
 debian/patches/rewrite_makefile.patch            | 231 -----------------------
 debian/patches/series                            |   4 -
 debian/rules                                     |   5 +-
 projects/unix/Makefile                           | 152 ++++++++-------
 src/config.c                                     |  18 +-
 src/config.h                                     |   1 -
 src/osal_preproc.h                               |   2 +-
 src/plugin.c                                     |  79 +++++---
 src/plugin.h                                     |   2 +
 src/version.h                                    |   6 +-
 19 files changed, 426 insertions(+), 748 deletions(-)

diff --cc debian/changelog
index e56476a,8d35e4b..b22e382
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,26 +1,35 @@@
 +mupen64plus-input-sdl (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:19:45 +0100
 +
+ mupen64plus-input-sdl (1.99.4+35+db912fcfb862-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision db912fcfb8621cd4060d9355d68bf4efa56387ff
+   * Remove unnecessary --as-needed from linker flags in debian/rules
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sat, 12 Nov 2011 21:39:59 +0100
+ 
+ mupen64plus-input-sdl (1.99.4+30+02519b25976b-1) experimental; urgency=low
+ 
+   * New upstream snapshot from revision 02519b25976b988cfd40af19acf383da4bd8f92f
+   * 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 patches 2controllers-per-usb-device.patch,
+       patches/inputautocfg.patch, mouse_sensitivity.patch,
+       rewrite_makefile.patch
+   * Update years in debian/copyright
+   * Add debian/get-orig-source.sh for snapshots
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Mon, 29 Aug 2011 17:05:38 +0200
+ 
  mupen64plus-input-sdl (1.99.4-4) unstable; urgency=low
  
    * debian/control:
diff --cc debian/control
index f4ed9e0,1a7095b..a88ec6c
--- a/debian/control
+++ b/debian/control
@@@ -9,9 -9,9 +9,9 @@@ Homepage: http://code.google.com/p/mupe
  Vcs-Git: git://anonscm.debian.org/collab-maint/mupen64plus-input-sdl.git
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-input-sdl.git
  Build-Depends:
 - debhelper (>= 8.1.3),
 + debhelper (>= 9),
   dpkg-dev (>= 1.16.0),
-  libmupen64plus-dev,
+  libmupen64plus-dev (>= 1.99.4+77+8bb0e6b3ae3a),
   libsdl1.2-dev | libsdl-dev,
  
  Package: mupen64plus-input-sdl
diff --cc debian/rules
index fe3625c,46f3c19..87e7305
--- 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-input-sdl.git