r6449 - in packages/trunk/wesnoth/debian: . patches

[Gerfried Fuchs]

Author: alfie
Date: 2008-04-06 15:08:25 +0000 (Sun, 06 Apr 2008)
New Revision: 6449

Removed:
   packages/trunk/wesnoth/debian/patches/04no-campaign-fix
Modified:
   packages/trunk/wesnoth/debian/changelog
   packages/trunk/wesnoth/debian/patches/series
Log:
 * New upstream release:
   - sample.py-fix made it into the 1.4 branch, removed.


Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog	2008-04-06 15:07:57 UTC (rev 6448)
+++ packages/trunk/wesnoth/debian/changelog	2008-04-06 15:08:25 UTC (rev 6449)
@@ -1,3 +1,10 @@
+wesnoth (1:1.4.1-1) experimental; urgency=low
+
+  * New upstream release:
+    - sample.py-fix made it into the 1.4 branch, removed.
+
+ -- Gerfried Fuchs <rhonda at debian.at>  Sun, 06 Apr 2008 17:05:18 +0200
+
 wesnoth (1:1.4-2) experimental; urgency=low
 
   * Upload to experimental due to new wesnoth-tools package which isn't

Deleted: packages/trunk/wesnoth/debian/patches/04no-campaign-fix
===================================================================
--- packages/trunk/wesnoth/debian/patches/04no-campaign-fix	2008-04-06 15:07:57 UTC (rev 6448)
+++ packages/trunk/wesnoth/debian/patches/04no-campaign-fix	2008-04-06 15:08:25 UTC (rev 6449)
@@ -1,20 +0,0 @@
-Author: Eric S. Raymond <esr at thyrsus.com>	vim:ft=diff:
-Description: display an error message if no campaign is available
-
-Index: wesnoth-1.4/src/game.cpp
-===================================================================
---- wesnoth-1.4.orig/src/game.cpp
-+++ wesnoth-1.4/src/game.cpp
-@@ -895,10 +895,11 @@ bool game_controller::new_campaign()
- 		campaign_desc.push_back(std::pair<std::string,std::string>(desc,image));
- 	}
- 
--	dialogs::campaign_preview_pane campaign_preview(disp().video(),&campaign_desc);
- 	if(campaign_names.size() <= 0) {
-+		gui::show_error_message(disp(), _("No campaigns are available.\n"));
- 		return false;
- 	}
-+	dialogs::campaign_preview_pane campaign_preview(disp().video(),&campaign_desc);
- 	gui::dialog cmenu(disp(), _("Play a campaign"), " ", gui::OK_CANCEL);
- 	cmenu.set_menu(campaign_names);
- 	cmenu.add_pane(&campaign_preview);

Modified: packages/trunk/wesnoth/debian/patches/series
===================================================================
--- packages/trunk/wesnoth/debian/patches/series	2008-04-06 15:07:57 UTC (rev 6448)
+++ packages/trunk/wesnoth/debian/patches/series	2008-04-06 15:08:25 UTC (rev 6449)
@@ -1,4 +1,3 @@
 01disable-rpath
 02wesnoth-nolog-desktop-file
-03sample.py-fix
 04no-campaign-fix