[mupen64plus-input-sdl] 185/196: Remove upstream merged autoconfig_sony_dualshock4.patch

[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 f94a5234d063ac1a40131a18dd576d7a7fd852ba
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri May 1 16:06:11 2015 +0200

    Remove upstream merged autoconfig_sony_dualshock4.patch
---
 debian/changelog                                |  2 ++
 debian/patches/autoconfig_sony_dualshock4.patch | 41 -------------------------
 debian/patches/series                           |  1 -
 debian/patches/xboxdrv_rumble_war.patch         |  4 +--
 4 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 049ba49..9049995 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mupen64plus-input-sdl (2.5-1) UNRELEASED; urgency=medium
   * New Upstream Version
   * Upgraded to policy 3.9.6, no changes required
   * Update years in debian/copyright
+  * debian/patches
+    - Remove upstream merged autoconfig_sony_dualshock4.patch
 
  -- Sven Eckelmann <sven at narfation.org>  Tue, 28 Apr 2015 22:22:38 +0200
 
diff --git a/debian/patches/autoconfig_sony_dualshock4.patch b/debian/patches/autoconfig_sony_dualshock4.patch
deleted file mode 100644
index 34316da..0000000
--- a/debian/patches/autoconfig_sony_dualshock4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Add support for Sony Dualshock4
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
-index 726d5a0658cfbed673e892403d329dd8ee2344b1..37d949a1cade6b244e1021ca952514d50e64fc4a 100755
---- a/data/InputAutoCfg.ini
-+++ b/data/InputAutoCfg.ini
-@@ -793,6 +793,32 @@ Rumblepak switch =
- X Axis = axis(0-,0+)
- Y Axis = axis(1-,1+)
- 
-+;Sony Playstation4/Dualshock4 Gamepad
-+[Sony Computer Entertainment Wireless Controller]
-+plugged = True
-+plugin = 2
-+mouse = False
-+AnalogDeadzone = 4096,4096
-+AnalogPeak = 32768,32768
-+DPad R = hat(0 Right)
-+DPad L = hat(0 Left)
-+DPad D = hat(0 Down)
-+DPad U = hat(0 Up)
-+Start = button(9)
-+Z Trig = button(6)
-+B Button = button(0)
-+A Button = button(1)
-+C Button R = axis(2+)
-+C Button L = axis(2-)
-+C Button D = axis(5+)
-+C Button U = axis(5-)
-+R Trig = button(5)
-+L Trig = button(4)
-+Mempak switch = 
-+Rumblepak switch = 
-+X Axis = axis(0-,0+)
-+Y Axis = axis(1-,1+)
-+
- [SAITEK P880]
- plugged = True
- plugin = 2
diff --git a/debian/patches/series b/debian/patches/series
index 73f1d59..3374b2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 xboxdrv_rumble_war.patch
-autoconfig_sony_dualshock4.patch
diff --git a/debian/patches/xboxdrv_rumble_war.patch b/debian/patches/xboxdrv_rumble_war.patch
index 5ad6b8b..c45bd9e 100644
--- a/debian/patches/xboxdrv_rumble_war.patch
+++ b/debian/patches/xboxdrv_rumble_war.patch
@@ -3,10 +3,10 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/src/plugin.c b/src/plugin.c
-index 9f4a202dd22354e2ee6b493a156c308ac0c67f33..1d351028e78a3379976f6d7422104ee67a4b5782 100755
+index 2e2cd95dc81a291777c5620e7171249fe054c3d4..44a531e22517fa533bfe753ce6d8fc339de8d821 100644
 --- a/src/plugin.c
 +++ b/src/plugin.c
-@@ -405,7 +405,7 @@ EXPORT void CALL ControllerCommand(int Control, unsigned char *Command)
+@@ -404,7 +404,7 @@ EXPORT void CALL ControllerCommand(int Control, unsigned char *Command)
  #if SDL_VERSION_ATLEAST(2,0,0)
                  if(dwAddress == PAK_IO_RUMBLE && controller[Control].event_joystick) {
                      if (*Data) {

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