[gweled] 65/72: Add upstream fix for timed and endless modes.

[Stephen Kitt]

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

skitt pushed a commit to branch debian-sid
in repository gweled.

commit 9f5a2ba2877a16d8437497d14a14fcb4d9a8b8b1
Author: Stephen Kitt <skitt at debian.org>
Date:   Thu May 26 18:28:06 2016 +0200

    Add upstream fix for timed and endless modes.
---
 debian/changelog                                   |  1 +
 .../patches/005-continue-endless-timed-modes.patch | 83 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 85 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b1677c1..3b23a04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gweled (0.9.1-4) UNRELEASED; urgency=medium
     taking care of it for so long! (Closes: #824504.)
   * Build-depend on libmikmod-dev and use pkg-config to find libmikmod.
     (Closes: #745072.)
+  * Add upstream fix for timed and endless modes. (Closes: #738455.)
 
  -- Stephen Kitt <skitt at debian.org>  Thu, 26 May 2016 17:47:31 +0200
 
diff --git a/debian/patches/005-continue-endless-timed-modes.patch b/debian/patches/005-continue-endless-timed-modes.patch
new file mode 100644
index 0000000..1e8943c
--- /dev/null
+++ b/debian/patches/005-continue-endless-timed-modes.patch
@@ -0,0 +1,83 @@
+Description: Endless and times modes continue even if no possible moves
+Author: Daniele Napolitano <dnax88 at gmail.com>
+Origin: http://bazaar.launchpad.net/~dnax88/gweled/trunk/revision/86
+Origin: http://bazaar.launchpad.net/~dnax88/gweled/trunk/revision/87
+Origin: http://bazaar.launchpad.net/~dnax88/gweled/trunk/revision/88
+
+--- a/po/gweled.pot
++++ b/po/gweled.pot
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2011-03-31 00:33+0200\n"
++"POT-Creation-Date: 2011-10-31 11:05+0100\n"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+@@ -60,15 +60,15 @@
+ msgstr ""
+ 
+ #: ../src/main.c:397
+-msgid "Get as many point as you can. The game ends if you out of moves."
++msgid "Get as many points as you can. The game ends if you run out of moves."
+ msgstr ""
+ 
+ #: ../src/main.c:399
+-msgid "Get as many points as you can, but you are limited on time."
++msgid "Get as many points as you can. The game ends if you run out of time."
+ msgstr ""
+ 
+ #: ../src/main.c:401
+-msgid "Game will never end. Your scores will not be registered."
++msgid "The game never ends, but your score will not be saved."
+ msgstr ""
+ 
+ #: ../src/main.c:461
+@@ -103,8 +103,8 @@
+ msgid "_Pause"
+ msgstr ""
+ 
+-#: ../src/board_engine.c:829 ../src/board_engine.c:902
+-#: ../src/board_engine.c:1004
++#: ../src/board_engine.c:830 ../src/board_engine.c:903
++#: ../src/board_engine.c:1005
+ #, c-format
+ msgid "Level %d"
+ msgstr ""
+--- a/src/board_engine.c
++++ b/src/board_engine.c
+@@ -764,7 +764,7 @@
+ 			gweled_gems_fall_into_place (FALSE);
+ 		} else {
+ 			if (gweled_check_for_moves_left (NULL, NULL) == FALSE) {
+-				if ((gi_next_bonus_at == FIRST_BONUS_AT) && (prefs.game_mode != ENDLESS_MODE)) {
++				if ((gi_level == 1) || (prefs.game_mode == ENDLESS_MODE) || (prefs.game_mode == TIMED_MODE)) {
+ 					gint i, j;
+                     // TRANSLATORS: # is replaced with !!
+ 					gweled_draw_game_message ("no moves left #", 1);
+@@ -792,6 +792,7 @@
+ 					gweled_gems_fall_into_place (FALSE);
+ 					gi_state = _MARK_ALIGNED_GEMS;
+ 				} else {
++				    // Game over
+ 					gweled_draw_message ("no moves left #");
+ 					gi_game_running = 0;
+ 					score.plain = gi_score;
+--- a/src/main.c
++++ b/src/main.c
+@@ -394,11 +394,11 @@
+     g_alignment_welcome = GTK_WIDGET (gtk_builder_get_object (gweled_xml, "alignmentWelcome"));
+ 
+     set_welcome_button_label (GTK_WIDGET (gtk_builder_get_object (gweled_xml, "labelDescNormal")),
+-                             _("Get as many point as you can. The game ends if you out of moves."));
++                             _("Get as many points as you can. The game ends if you run out of moves."));
+     set_welcome_button_label (GTK_WIDGET (gtk_builder_get_object (gweled_xml, "labelDescTimed")),
+-                             _("Get as many points as you can, but you are limited on time."));
++                             _("Get as many points as you can. The game ends if you run out of time."));
+     set_welcome_button_label (GTK_WIDGET (gtk_builder_get_object (gweled_xml, "labelDescEndless")),
+-                             _("Game will never end. Your scores will not be registered."));       
++                             _("The game never ends, but your score will not be saved."));       
+ 
+ 	load_preferences();
+ 	init_pref_window();
diff --git a/debian/patches/series b/debian/patches/series
index 8e320f9..8d525cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 001-potfiles.patch
 003-intools-update_ignore_quilt_directory.patch
 004-use-pkg-config-for-mikmod.patch
+005-continue-endless-timed-modes.patch

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