[mupen64plus-input-sdl] 80/196: Update inputautocfg.patch using new InputAutoCfg.ini from mercurial

[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 ae15dde1cef95f5fffdeaeb66fc9b0ee59360801
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Oct 31 11:40:48 2011 +0100

    Update inputautocfg.patch using new InputAutoCfg.ini from mercurial
---
 debian/changelog                  |  3 ++
 debian/patches/inputautocfg.patch | 85 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b935ed..e166d3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ mupen64plus-input-sdl (1.99.4-4) UNRELEASED; urgency=low
     buildflags
   * Use debian packaging manual URL as format identifier in
     debian/copyright
+  * debian/patches:
+    - Update inputautocfg.patch using new InputAutoCfg.ini from
+      mercurial
 
  -- Sven Eckelmann <sven at narfation.org>  Sat, 20 Aug 2011 21:53:29 +0200
 
diff --git a/debian/patches/inputautocfg.patch b/debian/patches/inputautocfg.patch
index 0e5bbd4..4f09ed0 100644
--- a/debian/patches/inputautocfg.patch
+++ b/debian/patches/inputautocfg.patch
@@ -3,7 +3,7 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
-index f41d14b44f892115e1e6c040ecf374be1559b7ea..4483d9fdb61a16f0044d5abf98a206c7beec0189 100644
+index f41d14b44f892115e1e6c040ecf374be1559b7ea..2d854b018d43d38ce532e7159d16c26fe7f9ac6a 100644
 --- a/data/InputAutoCfg.ini
 +++ b/data/InputAutoCfg.ini
 @@ -125,6 +125,32 @@ Rumblepak switch = button(0)
@@ -71,7 +71,84 @@ index f41d14b44f892115e1e6c040ecf374be1559b7ea..4483d9fdb61a16f0044d5abf98a206c7
  [Logitech Cordless Rumblepad 2]
  [Logitech RumblePad 2 USB]
  [Logitech Dual Action]
-@@ -525,8 +576,7 @@ Rumblepak switch =
+@@ -375,6 +426,29 @@ Rumblepak switch =
+ X Axis = axis(0-,0+)
+ Y Axis = axis(1-,1+)
+ 
++[Linux: Xbox Gamepad (userspace driver)]
++plugged = True
++plugin = 2
++mouse = False
++DPad R = button(3)
++DPad L = button(2)
++DPad D = button(1)
++DPad U = button(0)
++Start = button(13)
++Z Trig = button(8)
++B Button = button(6)
++A Button = button(4)
++C Button R = axis(2+)
++C Button L = axis(2-)
++C Button D = axis(3+)
++C Button U = axis(3-)
++R Trig = button(9)
++L Trig = button(10)
++Mempak switch =
++Rumblepak switch =
++X Axis = axis(0-,0+)
++Y Axis = axis(1-,1+)
++
+ [N64 controller]
+ plugged = True
+ plugin = 2
+@@ -431,10 +505,10 @@ plugin = 2
+ mouse = False
+ AnalogDeadzone = 4096,4096
+ AnalogPeak = 32768,32768
+-DPad R = axis(4+)
+-DPad L = axis(4-)
+-DPad D = axis(5+)
+-DPad U = axis(5-)
++DPad R = hat(0 Right)
++DPad L = hat(0 Left)
++DPad D = hat(0 Down)
++DPad U = hat(0 Up)
+ Start = button(5)
+ Z Trig = button(4)
+ B Button = button(0)
+@@ -450,6 +524,31 @@ Rumblepak switch = axis(10+)
+ X Axis = axis(0-,0+)
+ Y Axis = axis(1-,1+)
+ 
++[Saitek P2900 Wireless Pad]
++plugged = True
++plugin = 2
++mouse = False
++AnalogDeadzone = 4096,4096
++AnalogPeak = 32768,32768
++DPad R = axis(4+)
++DPad L = axis(4-)
++DPad D = axis(5+)
++DPad U = axis(5-)
++Start = button(6)
++Z Trig = button(7)
++B Button = button(0)
++A Button = button(1)
++C Button R = button(8) axis(3+)
++C Button L = button(3) axis(3-)
++C Button D = button(2) axis(2+)
++C Button U = button(9) axis(2-)
++R Trig = button(5)
++L Trig = button(4)
++Mempak switch = button(11)
++Rumblepak switch = axis(10+)
++X Axis = axis(0-,0+)
++Y Axis = axis(1-,1+)
++
+ [Thrustmaster Dual Trigger 3-in-1]
+ plugged = True
+ plugin = 2
+@@ -525,8 +624,7 @@ Rumblepak switch =
  Y Axis = axis(1-,1+)
  X Axis = axis(0-,0+)
  
@@ -81,7 +158,7 @@ index f41d14b44f892115e1e6c040ecf374be1559b7ea..4483d9fdb61a16f0044d5abf98a206c7
  plugged = True
  plugin = 2
  mouse = False
-@@ -629,6 +679,8 @@ Y Axis = axis(1-,1+)
+@@ -629,6 +727,8 @@ Y Axis = axis(1-,1+)
  [BigBen XBMiniPad Controller]
  [Joytech Wireless Advanced Controller]
  [Chinese-made Xbox Controller]
@@ -90,7 +167,7 @@ index f41d14b44f892115e1e6c040ecf374be1559b7ea..4483d9fdb61a16f0044d5abf98a206c7
  plugged = True
  plugin = 2
  mouse = False
-@@ -653,9 +705,60 @@ Rumblepak switch = button(2)
+@@ -653,9 +753,60 @@ Rumblepak switch = button(2)
  X Axis = axis(0-,0+)
  Y Axis = axis(1-,1+)
  

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