[Pkg-sdl-commits] [libsdl2] 07/16: Drop patches included upstream

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch experimental
in repository libsdl2.

commit efeeee2017b537cf89869c390db2b1bb15c4c18f
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sun Jan 3 12:34:43 2016 +0100

    Drop patches included upstream
---
 debian/changelog                           |  2 ++
 debian/patches/fix_joystick_misc_axes.diff | 17 -----------
 debian/patches/series                      |  2 --
 debian/patches/use-default-screen          | 48 ------------------------------
 4 files changed, 2 insertions(+), 67 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2993e82..16e5ffc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libsdl2 (2.0.4+dfsg1-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release (Closes: #788688, #798265, #788540)
+    * Drop patches use-default-screen and
+      fix_joystick_misc_axes.diff, applied upstream.
   * Add Files-Excluded keyword to copyright file, allowing to
     import a new release with uscan command. (Closes: #804662)
 
diff --git a/debian/patches/fix_joystick_misc_axes.diff b/debian/patches/fix_joystick_misc_axes.diff
deleted file mode 100644
index a40b158..0000000
--- a/debian/patches/fix_joystick_misc_axes.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Left/Right Joystick Axis doesn't work with some controllers
-Author: Sam Hocevar <sam at hocevar.net>
-Last-Update: 2013-10-19
-Bug-Debian: http://bugs.debian.org/673324
-Forwarded: https://bugzilla.libsdl.org/show_bug.cgi?id=2165
-
---- a/src/joystick/linux/SDL_sysjoystick.c
-+++ b/src/joystick/linux/SDL_sysjoystick.c
-@@ -500,7 +500,7 @@
-                 ++joystick->nbuttons;
-             }
-         }
--        for (i = 0; i < ABS_MISC; ++i) {
-+        for (i = 0; i < ABS_MAX; ++i) {
-             /* Skip hats */
-             if (i == ABS_HAT0X) {
-                 i = ABS_HAT3Y;
diff --git a/debian/patches/series b/debian/patches/series
index 71d01f8..c0c944d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-use-default-screen
 SDL2_dont_propagate_lpthread.diff
-fix_joystick_misc_axes.diff
diff --git a/debian/patches/use-default-screen b/debian/patches/use-default-screen
deleted file mode 100644
index d71bbf6..0000000
--- a/debian/patches/use-default-screen
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Use default screen
- Respect default screen from DISPLAY variable, using standard X11 function calls.
-Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=2192
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%23754401
-Author: Steaphan Greene
-Origin: upstream
-From: https://hg.libsdl.org/SDL/rev/3d2c0f659ad3
-Reviewed-by: dod
---- a/src/video/x11/SDL_x11modes.c	Wed Oct 15 15:50:35 2014 -0400
-+++ b/src/video/x11/SDL_x11modes.c	Wed Oct 15 18:33:43 2014 -0300
-@@ -375,7 +375,7 @@
- X11_InitModes(_THIS)
- {
-     SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
--    int screen, screencount;
-+    int snum, screen, screencount;
- #if SDL_VIDEO_DRIVER_X11_XINERAMA
-     int xinerama_major, xinerama_minor;
-     int use_xinerama = 0;
-@@ -423,7 +423,7 @@
-     }
- #endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */
- 
--    for (screen = 0; screen < screencount; ++screen) {
-+    for (snum = 0; snum < screencount; ++snum) {
-         XVisualInfo vinfo;
-         SDL_VideoDisplay display;
-         SDL_DisplayData *displaydata;
-@@ -433,6 +433,15 @@
-         char display_name[128];
-         int i, n;
- 
-+        /* Re-order screens to always put default screen first */
-+        if (snum == 0) {
-+            screen = DefaultScreen(data->display);
-+        } else if (snum == DefaultScreen(data->display)) {
-+            screen = 0;
-+        } else {
-+            screen = snum;
-+        }
-+
- #if SDL_VIDEO_DRIVER_X11_XINERAMA
-         if (xinerama) {
-             if (get_visualinfo(data->display, 0, &vinfo) < 0) {
-
-
-
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2.git