This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository extremetuxracer.
commit 41a4051675f1c6edaa6a075aeb6f2c541f924e09 Author: Markus Koschany <[email protected]> Date: Thu Dec 3 16:48:06 2015 +0100 Run all patches through gbp pq import --- debian/patches/10_norwegian_translation.diff | 17 +++++++++++---- debian/patches/40_fix_keyboard_config.diff | 25 +++++++++++++++------- .../patches/fix_segfault_in_race_select_menu.diff | 17 +++++++++++---- 3 files changed, 43 insertions(+), 16 deletions(-) diff --git a/debian/patches/10_norwegian_translation.diff b/debian/patches/10_norwegian_translation.diff index f238784..953e04d 100644 --- a/debian/patches/10_norwegian_translation.diff +++ b/debian/patches/10_norwegian_translation.diff @@ -1,3 +1,7 @@ +From: Debian Games Team <[email protected]> +Date: Thu, 3 Dec 2015 16:47:33 +0100 +Subject: _norwegian_translation + #! /bin/sh /usr/share/dpatch/dpatch-run ## 10_norwegian_translation.dpatch by <[email protected]> ## @@ -5,10 +9,15 @@ ## DP: corrects bad translations in the norwegian language file, reported by Petter Reinholdtsen <[email protected]> @DPATCH@ -diff -urNad ppracer-0.3.1~/data/translations/nb_NO.tcl ppracer-0.3.1/data/translations/nb_NO.tcl ---- ppracer-0.3.1~/data/translations/nb_NO.tcl 2005-02-28 09:17:47.000000000 +0100 -+++ ppracer-0.3.1/data/translations/nb_NO.tcl 2005-11-05 20:06:29.000000000 +0100 -@@ -9,8 +9,8 @@ +--- + data/translations/nb_NO.tcl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/translations/nb_NO.tcl b/data/translations/nb_NO.tcl +index d954f4d..ce34f14 100644 +--- a/data/translations/nb_NO.tcl ++++ b/data/translations/nb_NO.tcl +@@ -9,8 +9,8 @@ pp_translate_string "PRESS ANY KEY TO START" "Trykk en tast for å starte" #game_type_select pp_translate_string "Enter an event" "Kjør et renn" pp_translate_string "Practice" "Øvelsesrenn" diff --git a/debian/patches/40_fix_keyboard_config.diff b/debian/patches/40_fix_keyboard_config.diff index 62b9a20..a41f362 100644 --- a/debian/patches/40_fix_keyboard_config.diff +++ b/debian/patches/40_fix_keyboard_config.diff @@ -1,3 +1,7 @@ +From: Debian Games Team <[email protected]> +Date: Thu, 3 Dec 2015 16:47:33 +0100 +Subject: _fix_keyboard_config + #! /bin/sh /usr/share/dpatch/dpatch-run ## 30_fix_keyboard_config.dpatch by Stefan Potyra <[email protected]> ## @@ -6,9 +10,14 @@ ## DP: otherwise you can't configure the keyboard to use arrow keys. @DPATCH@ -diff -urNad ppracer-0.3.1~/src/keyboardconfig.cpp ppracer-0.3.1/src/keyboardconfig.cpp ---- ppracer-0.3.1~/src/keyboardconfig.cpp 2005-02-18 11:15:44.000000000 +0100 -+++ ppracer-0.3.1/src/keyboardconfig.cpp 2006-03-25 01:09:52.000000000 +0100 +--- + src/keyboardconfig.cpp | 116 ++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 87 insertions(+), 29 deletions(-) + +diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp +index 2b0f6cb..74cb877 100644 +--- a/src/keyboardconfig.cpp ++++ b/src/keyboardconfig.cpp @@ -25,14 +25,17 @@ struct KeyMap{ @@ -32,7 +41,7 @@ diff -urNad ppracer-0.3.1~/src/keyboardconfig.cpp ppracer-0.3.1/src/keyboardconf {SDLK_KP0,"keypad 0"}, {SDLK_KP1,"keypad 1"}, {SDLK_KP2,"keypad 2"}, -@@ -46,12 +49,61 @@ +@@ -46,12 +49,61 @@ static KeyMap keymap[] = { {SDLK_KP_PERIOD,"keypad ."}, {SDLK_KP_DIVIDE,"keypad /"}, {SDLK_KP_MULTIPLY,"keypad *"}, @@ -54,7 +63,7 @@ diff -urNad ppracer-0.3.1~/src/keyboardconfig.cpp ppracer-0.3.1/src/keyboardconf + {SDLK_END,"end"}, + {SDLK_PAGEUP,"page up"}, + {SDLK_PAGEDOWN,"page down"}, - ++ + {SDLK_F1,"F1"}, + {SDLK_F2,"F2"}, + {SDLK_F3,"F3"}, @@ -70,7 +79,7 @@ diff -urNad ppracer-0.3.1~/src/keyboardconfig.cpp ppracer-0.3.1/src/keyboardconf + {SDLK_F13,"F13"}, + {SDLK_F14,"F14"}, + {SDLK_F15,"F15"}, -+ + + {SDLK_NUMLOCK,"numlock"}, + {SDLK_CAPSLOCK,"capslock"}, + {SDLK_SCROLLOCK,"scrollock"}, @@ -97,7 +106,7 @@ diff -urNad ppracer-0.3.1~/src/keyboardconfig.cpp ppracer-0.3.1/src/keyboardconf KeyboardConfig::KeyboardConfig() { -@@ -172,33 +224,31 @@ +@@ -172,33 +224,31 @@ KeyboardConfig::apply() void KeyboardConfig::setKey(pp::Entry* widget, SDLKey key) { @@ -150,7 +159,7 @@ diff -urNad ppracer-0.3.1~/src/keyboardconfig.cpp ppracer-0.3.1/src/keyboardconf return content; } -@@ -211,6 +261,14 @@ +@@ -211,6 +261,14 @@ KeyboardConfig::getKey(std::string& string) return keymap[i].key; } } diff --git a/debian/patches/fix_segfault_in_race_select_menu.diff b/debian/patches/fix_segfault_in_race_select_menu.diff index a6c65fe..307c3bc 100644 --- a/debian/patches/fix_segfault_in_race_select_menu.diff +++ b/debian/patches/fix_segfault_in_race_select_menu.diff @@ -1,8 +1,17 @@ -Index: ppracer-0.3.1/src/event_race_select.cpp +From: Debian Games Team <[email protected]> +Date: Thu, 3 Dec 2015 16:47:34 +0100 +Subject: fix_segfault_in_race_select_menu + =================================================================== ---- ppracer-0.3.1.orig/src/event_race_select.cpp 2007-01-13 14:12:48.000000000 +0100 -+++ ppracer-0.3.1/src/event_race_select.cpp 2007-01-13 14:13:25.000000000 +0100 -@@ -448,13 +448,13 @@ +--- + src/event_race_select.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/event_race_select.cpp b/src/event_race_select.cpp +index 76b6652..3d0319f 100644 +--- a/src/event_race_select.cpp ++++ b/src/event_race_select.cpp +@@ -451,13 +451,13 @@ EventRaceSelect::keyPressEvent(SDLKey key) UIMgr.setDirty(); return true; case 'c': -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/extremetuxracer.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
