Author: alfie Date: 2008-04-04 13:42:31 +0000 (Fri, 04 Apr 2008) New Revision: 6436
Added: packages/trunk/wesnoth/debian/patches/04no-campaign-fix Modified: packages/trunk/wesnoth/debian/changelog packages/trunk/wesnoth/debian/patches/03sample.py-fix packages/trunk/wesnoth/debian/patches/series Log: * Pull no-campaign-fix from upstream svn r25532 (closes: #471851) switch target to experimental because I don't want the highly untested wesnoth-tools package to make the package drop from the release Modified: packages/trunk/wesnoth/debian/changelog =================================================================== --- packages/trunk/wesnoth/debian/changelog 2008-04-04 13:25:57 UTC (rev 6435) +++ packages/trunk/wesnoth/debian/changelog 2008-04-04 13:42:31 UTC (rev 6436) @@ -1,5 +1,10 @@ -wesnoth (1:1.4-2) unstable; urgency=low +wesnoth (1:1.4-2) experimental; urgency=low + * Upload to experimental due to new wesnoth-tools package which isn't + fully tested yet and may work against python policy. + * Add wesnoth-tools package including the most useful tools for campaign + developers. + * Build a wesnoth-smallgui binary (closes: #469234) * Patch wesnoth-nolog-desktop-file for calling wesnoth-nolog instead of wesnoth from desktop file (triggered by #469800) * Switch from ttf-arphic-gkai00mp (gkai00mp.ttf) to ttf-wqy-zenhei @@ -15,21 +20,19 @@ descriptions from the package instead of redoing them from scratch, thanks. * Remove ttf-dejavu dependency from editor, it's in dependent package wesnoth-data anyway. - * Add wesnoth-tools package including the most useful tools for campaign - developers. * Install documentation only into wesnoth-data package and make the depending packages have symlinks to the doc dir. - * Build a wesnoth-smallgui binary (closes: #469234) * Make use of the http://sf.net/$project/ hack in debian/watch instead of chosing a mirror on our own. * Recommend the three introduction campaigns from the wesnoth package and add informations about it to the package description (closes: #471912) * Improve other package descriptions a little, too. * Pull sample.py-fix patch from upstream svn r25432 (closes: #472416) + * Pull no-campaign-fix from upstream svn r25532 (closes: #471851) * Add NEWS.Debian file explaining the save game incompatibility to the former stable release. - -- Gerfried Fuchs <[EMAIL PROTECTED]> Wed, 02 Apr 2008 16:15:41 +0200 + -- Gerfried Fuchs <[EMAIL PROTECTED]> Fri, 04 Apr 2008 15:39:47 +0200 wesnoth (1:1.4-1) unstable; urgency=low Modified: packages/trunk/wesnoth/debian/patches/03sample.py-fix =================================================================== --- packages/trunk/wesnoth/debian/patches/03sample.py-fix 2008-04-04 13:25:57 UTC (rev 6435) +++ packages/trunk/wesnoth/debian/patches/03sample.py-fix 2008-04-04 13:42:31 UTC (rev 6436) @@ -1,3 +1,6 @@ +Author: Tommy <[EMAIL PROTECTED]> vim:ft=diff: +Description: fix python syntax in sample.py AI + Index: wesnoth-1.4/data/ais/sample.py =================================================================== --- wesnoth-1.4.orig/data/ais/sample.py Added: packages/trunk/wesnoth/debian/patches/04no-campaign-fix =================================================================== --- packages/trunk/wesnoth/debian/patches/04no-campaign-fix (rev 0) +++ packages/trunk/wesnoth/debian/patches/04no-campaign-fix 2008-04-04 13:42:31 UTC (rev 6436) @@ -0,0 +1,20 @@ +Author: Eric S. Raymond <[EMAIL PROTECTED]> 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-04 13:25:57 UTC (rev 6435) +++ packages/trunk/wesnoth/debian/patches/series 2008-04-04 13:42:31 UTC (rev 6436) @@ -1,3 +1,4 @@ 01disable-rpath 02wesnoth-nolog-desktop-file 03sample.py-fix +04no-campaign-fix _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits