[mupen64plus-input-sdl] 109/196: Remove upstream merged patches
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:00:26 UTC 2015
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 ad30c3ad2c90a89c178a7df384c191b1b1f4394e
Author: Sven Eckelmann <sven at narfation.org>
Date: Sat Jun 16 22:02:20 2012 +0200
Remove upstream merged patches
---
debian/changelog | 3 +++
debian/patches/huijia_adapter_config.patch | 42 ------------------------------
debian/patches/hyperkin_tomee_config.patch | 41 -----------------------------
debian/patches/series | 3 ---
debian/patches/verbose_warning.patch | 18 -------------
5 files changed, 3 insertions(+), 104 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a4ba6bb..e6a1052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
mupen64plus-input-sdl (1.99.5+8+26e230321985-1) UNRELEASED; urgency=low
* New Upstream Snapshot from 26e230321985cdb3a3673aed0b678df0eb337a07
+ * debian/patches:
+ - Remove upstream merged huijia_adapter_config.patch,
+ hyperkin_tomee_config.patch, verbose_warning.patches
-- Sven Eckelmann <sven at narfation.org> Sat, 16 Jun 2012 22:00:47 +0200
diff --git a/debian/patches/huijia_adapter_config.patch b/debian/patches/huijia_adapter_config.patch
deleted file mode 100644
index 84302cb..0000000
--- a/debian/patches/huijia_adapter_config.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Fix for HuiJia adapter auto-config
-Author: Richard Goedeken <Richard at fascinationsoftware.com>
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-input-sdl/changeset/862053cf1d9e
-
----
-diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
-index 8ab3ce72a3c83dde245a1d204e38b62e1bd32f82..2c917fedfe7fc429681f08567f7f3d382b4bb26b 100644
---- a/data/InputAutoCfg.ini
-+++ b/data/InputAutoCfg.ini
-@@ -705,8 +705,8 @@ Start = button(9)
- Z Trig = button(8)
- B Button = button(2)
- A Button = button(1)
--C Button R = axis(5-)
--C Button L = axis(5+)
-+C Button R = axis(3-)
-+C Button L = axis(3+)
- C Button D = axis(2+)
- C Button U = axis(2-)
- R Trig = button(7)
-@@ -729,16 +729,16 @@ Start = button(25)
- Z Trig = button(24)
- B Button = button(18)
- A Button = button(17)
--C Button R = axis(6-)
--C Button L = axis(6+)
--C Button D = axis(3+)
--C Button U = axis(3-)
-+C Button R = axis(7-)
-+C Button L = axis(7+)
-+C Button D = axis(6+)
-+C Button U = axis(6-)
- R Trig = button(23)
- L Trig = button(22)
- Mempak switch = key(44)
- Rumblepak switch = key(46)
- X Axis = axis(4-,4+)
--Y Axis = axis(7-,7+)
-+Y Axis = axis(5-,5+)
-
- ; Asikgame - Super Dual Box (with two PS2 gamepads connected)
- ; this is a 2-port USB device. The Right port is controller #1, the Left port is #2
diff --git a/debian/patches/hyperkin_tomee_config.patch b/debian/patches/hyperkin_tomee_config.patch
deleted file mode 100644
index 7a119c3..0000000
--- a/debian/patches/hyperkin_tomee_config.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: added auto-config for Hyperkin Tomee N64 controller
-Author: Richard Goedeken <Richard at fascinationsoftware.com>
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-input-sdl/changeset/18b3ab2408be
-
----
-diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
-index 2c917fedfe7fc429681f08567f7f3d382b4bb26b..152b36ef026781600696396497ac4ad28ebd3dff 100644
---- a/data/InputAutoCfg.ini
-+++ b/data/InputAutoCfg.ini
-@@ -359,6 +359,31 @@ Rumblepak switch = key(114)
- X Axis = axis(0-,0+)
- Y Axis = axis(1-,1+)
-
-+[PC Game 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(8)
-+B Button = button(4)
-+A Button = button(5)
-+C Button R = button(1)
-+C Button L = button(3)
-+C Button D = button(2)
-+C Button U = button(0)
-+R Trig = button(7)
-+L Trig = button(6)
-+Mempak switch = key(109)
-+Rumblepak switch = key(114)
-+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
deleted file mode 100644
index 0c6b3cd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-huijia_adapter_config.patch
-hyperkin_tomee_config.patch
-verbose_warning.patch
diff --git a/debian/patches/verbose_warning.patch b/debian/patches/verbose_warning.patch
deleted file mode 100644
index 6373e73..0000000
--- a/debian/patches/verbose_warning.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Change warning message (SDL joystick not available) to VERBOSE
-Author: Richard Goedeken <Richard at fascinationsoftware.com>
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-input-sdl/changeset/de6c9330ffe3
-
----
-diff --git a/src/config.c b/src/config.c
-index 885c30cf28508361190027972ac8ac6283f57948..b4d1ead0869d23ff2a6a32316c0168ac9810c5f3 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -505,7 +505,7 @@ void load_configuration(int bPrintSummary)
- {
- controller[n64CtrlIdx].device = DEVICE_AUTO;
- controller[n64CtrlIdx].control->Present = 0;
-- DebugMessage(M64MSG_WARNING, "N64 Controller #%i: Disabled, SDL joystick %i is not available", n64CtrlIdx+1, sdlCtrlIdx-1);
-+ DebugMessage(M64MSG_VERBOSE, "N64 Controller #%i: Disabled, SDL joystick %i is not available", n64CtrlIdx+1, sdlCtrlIdx-1);
- }
- else
- {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-input-sdl.git
More information about the Pkg-games-commits
mailing list