r14510 - in packages/trunk/supertux/debian: . patches
Vincent Cheng
vincentc-guest at alioth.debian.org
Tue Aug 20 08:20:17 UTC 2013
Author: vincentc-guest
Date: 2013-08-20 08:20:16 +0000 (Tue, 20 Aug 2013)
New Revision: 14510
Removed:
packages/trunk/supertux/debian/patches/fix_curl_ftbfs.patch
packages/trunk/supertux/debian/patches/fix_gcc4.6_ftbfs.patch
packages/trunk/supertux/debian/patches/fix_joystick_conf_loss.patch
packages/trunk/supertux/debian/patches/fix_man_page.patch
Modified:
packages/trunk/supertux/debian/changelog
packages/trunk/supertux/debian/patches/series
Log:
supertux: Remove patches applied upstream
Modified: packages/trunk/supertux/debian/changelog
===================================================================
--- packages/trunk/supertux/debian/changelog 2013-08-20 08:15:49 UTC (rev 14509)
+++ packages/trunk/supertux/debian/changelog 2013-08-20 08:20:16 UTC (rev 14510)
@@ -1,6 +1,8 @@
supertux (0.3.4-1) experimental; urgency=low
* New upstream release.
+ - Remove patches applied upstream:
+ fix_{man_page,curl_ftbfs,gcc4.6_ftbfs,joystick_conf_loss}.patch
* Remove unnecessary Build-Conflicts field.
* Update watch file (thanks to Bart Martens).
Deleted: packages/trunk/supertux/debian/patches/fix_curl_ftbfs.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_curl_ftbfs.patch 2013-08-20 08:15:49 UTC (rev 14509)
+++ packages/trunk/supertux/debian/patches/fix_curl_ftbfs.patch 2013-08-20 08:20:16 UTC (rev 14510)
@@ -1,15 +0,0 @@
-Description: Fix FTBFS with curl >= 7.21.7
-Author: Christoph Egger <christoph at debian.org>
-Bug: https://supertux.lethargik.org/bugs/view.php?id=855
-Last-Update: 2012-03-04
-
---- a/src/addon/addon_manager.cpp
-+++ b/src/addon/addon_manager.cpp
-@@ -29,7 +29,6 @@
- #ifdef HAVE_LIBCURL
- # include <curl/curl.h>
- # include <curl/easy.h>
--# include <curl/types.h>
- #endif
-
- #include "addon/addon.hpp"
Deleted: packages/trunk/supertux/debian/patches/fix_gcc4.6_ftbfs.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_gcc4.6_ftbfs.patch 2013-08-20 08:15:49 UTC (rev 14509)
+++ packages/trunk/supertux/debian/patches/fix_gcc4.6_ftbfs.patch 2013-08-20 08:20:16 UTC (rev 14510)
@@ -1,15 +0,0 @@
-Description: Add missing header. Fixes FTBFS with gcc 4.6.
-Author: Ilya Barygin <barygin at gmail.com>
-Bug-Ubuntu: https://launchpad.net/bugs/832874
-Bug-Debian: http://bugs.debian.org/640192
-
---- a/src/supertux/screen_manager.hpp
-+++ b/src/supertux/screen_manager.hpp
-@@ -18,6 +18,7 @@
- #define HEADER_SUPERTUX_SUPERTUX_MAINLOOP_HPP
-
- #include <memory>
-+#include <cstring>
-
- #include "scripting/thread_queue.hpp"
-
Deleted: packages/trunk/supertux/debian/patches/fix_joystick_conf_loss.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_joystick_conf_loss.patch 2013-08-20 08:15:49 UTC (rev 14509)
+++ packages/trunk/supertux/debian/patches/fix_joystick_conf_loss.patch 2013-08-20 08:20:16 UTC (rev 14510)
@@ -1,43 +0,0 @@
-Description: Do not reset joystick conf when the joystick is not plugged in
- If the game is started when the joystick/joypad is not plugged in,
- the joystick input configuration should not be reset to its default
- state.
-Author: Arian Behvandnejad <buggy at lavabit.com>
-Origin: https://supertux.lethargik.org/bugs/file_download.php?file_id=657&type=bug
-Bug: https://supertux.lethargik.org/bugs/view.php?id=959
-Bug-Debian: http://bugs.debian.org/706564
-Last-Update: 2013-05-13
-
---- supertux-0.3.3.orig/src/control/joystickkeyboardcontroller.cpp
-+++ supertux-0.3.3/src/control/joystickkeyboardcontroller.cpp
-@@ -229,8 +229,10 @@ JoystickKeyboardController::read(const R
- continue;
- }
-
-+ bool js_available = joysticks.size() > 0;
-+
- if (map->get("button", button)) {
-- if(button < 0 || button >= max_joybuttons) {
-+ if(js_available && (button < 0 || button >= max_joybuttons)) {
- log_info << "Invalid button '" << button << "' in buttonmap" << std::endl;
- continue;
- }
-@@ -238,7 +240,7 @@ JoystickKeyboardController::read(const R
- }
-
- if (map->get("axis", axis)) {
-- if (axis == 0 || abs(axis) > max_joyaxis) {
-+ if (js_available && (axis == 0 || abs(axis) > max_joyaxis)) {
- log_info << "Invalid axis '" << axis << "' in axismap" << std::endl;
- continue;
- }
-@@ -246,7 +248,8 @@ JoystickKeyboardController::read(const R
- }
-
- if (map->get("hat", hat)) {
-- if (hat != SDL_HAT_UP &&
-+ if (js_available &&
-+ hat != SDL_HAT_UP &&
- hat != SDL_HAT_DOWN &&
- hat != SDL_HAT_LEFT &&
- hat != SDL_HAT_RIGHT) {
Deleted: packages/trunk/supertux/debian/patches/fix_man_page.patch
===================================================================
--- packages/trunk/supertux/debian/patches/fix_man_page.patch 2013-08-20 08:15:49 UTC (rev 14509)
+++ packages/trunk/supertux/debian/patches/fix_man_page.patch 2013-08-20 08:20:16 UTC (rev 14510)
@@ -1,17 +0,0 @@
-Description: Fix manpage related error
- W: supertux: manpage-has-errors-from-man usr/share/man/man6/supertux2.6.gz
- 126: warning: macro `..' not defined
-Author: Christoph Egger <christoph at debian.org>
-Forwarded: not-yet
-
---- a/man/man6/supertux2.6
-+++ b/man/man6/supertux2.6
-@@ -123,7 +123,7 @@
- .nf
- levels/sample_collection/info
- levels/sample_collection/level01.stl
--...
-+ ...
- .fi
- .SH BUGS
- This is a development version, so expect plenty of bugs.
Modified: packages/trunk/supertux/debian/patches/series
===================================================================
--- packages/trunk/supertux/debian/patches/series 2013-08-20 08:15:49 UTC (rev 14509)
+++ packages/trunk/supertux/debian/patches/series 2013-08-20 08:20:16 UTC (rev 14510)
@@ -1,8 +1,4 @@
-fix_gcc4.6_ftbfs.patch
fix_gcc4.7_ftbfs.patch
-fix_curl_ftbfs.patch
-embedded_libsquirrel.patch
fix_desktop_file.patch
fix_spelling_errors.patch
fix_man_page.patch
-fix_joystick_conf_loss.patch
More information about the Pkg-games-commits
mailing list