Author: alfie
Date: 2008-05-03 14:30:22 +0000 (Sat, 03 May 2008)
New Revision: 6841
Removed:
packages/branches/wesnoth/experimental/debian/patches/04no-campaign-fix
packages/branches/wesnoth/experimental/debian/patches/05address-align-for-sparc
Modified:
packages/branches/wesnoth/experimental/debian/changelog
packages/branches/wesnoth/experimental/debian/patches/02wesnoth-nolog-desktop-file
packages/branches/wesnoth/experimental/debian/patches/series
packages/branches/wesnoth/experimental/debian/wesnoth-data.install
Log:
- Patches not needed anymore: no-campaign-fix, address-align-for-sparc.
(remaining patch refreshed)
* New gettext domain wesnoth-anl for a muliplayer scenario, installing it
into wesnoth-data mainpackage.
Modified: packages/branches/wesnoth/experimental/debian/changelog
===================================================================
--- packages/branches/wesnoth/experimental/debian/changelog 2008-05-03
09:46:51 UTC (rev 6840)
+++ packages/branches/wesnoth/experimental/debian/changelog 2008-05-03
14:30:22 UTC (rev 6841)
@@ -3,6 +3,7 @@
* New upstream release (closes: #478793), includes fix for:
- 100% evasion on some terrain acts as 50% (closes: #467253)
- The Court of Karrag: no TC for Karrag as Dwarf (closes: #473218)
+ - Patches not needed anymore: no-campaign-fix, address-align-for-sparc.
* Switched version information in debian/rules and debian/watch to
development release dependencies.
* Do postinst hooks only on upgrades from older versions than 1:1.4.1-2,
@@ -12,8 +13,10 @@
only suggests.
* Rename debian/NEWS.Debian to debian/NEWS which dh_installchangelogs likes
to pick up and install as NEWS.Debian...
+ * New gettext domain wesnoth-anl for a muliplayer scenario, installing it
+ into wesnoth-data mainpackage.
- -- Gerfried Fuchs <[EMAIL PROTECTED]> Sat, 03 May 2008 11:32:39 +0200
+ -- Gerfried Fuchs <[EMAIL PROTECTED]> Sat, 03 May 2008 16:26:18 +0200
wesnoth (1:1.4.1-2) unstable; urgency=low
Modified:
packages/branches/wesnoth/experimental/debian/patches/02wesnoth-nolog-desktop-file
===================================================================
---
packages/branches/wesnoth/experimental/debian/patches/02wesnoth-nolog-desktop-file
2008-05-03 09:46:51 UTC (rev 6840)
+++
packages/branches/wesnoth/experimental/debian/patches/02wesnoth-nolog-desktop-file
2008-05-03 14:30:22 UTC (rev 6841)
@@ -1,10 +1,10 @@
Author: Gerfried Fuchs <[EMAIL PROTECTED]> vim:ft=diff:
Description: call wesnoth-nolog from desktop file, too
-Index: wesnoth-1.4.1/icons/wesnoth.desktop
+Index: wesnoth-1.5.0a/icons/wesnoth.desktop
===================================================================
---- wesnoth-1.4.1.orig/icons/wesnoth.desktop
-+++ wesnoth-1.4.1/icons/wesnoth.desktop
+--- wesnoth-1.5.0a.orig/icons/wesnoth.desktop
++++ wesnoth-1.5.0a/icons/wesnoth.desktop
@@ -44,6 +44,6 @@ Comment[sk]=Ťahová strategická hra z
Comment[sr]=Фантазијска стратешка игра на потезе
[EMAIL PROTECTED] strateška igra na poteze
Deleted: packages/branches/wesnoth/experimental/debian/patches/04no-campaign-fix
===================================================================
--- packages/branches/wesnoth/experimental/debian/patches/04no-campaign-fix
2008-05-03 09:46:51 UTC (rev 6840)
+++ packages/branches/wesnoth/experimental/debian/patches/04no-campaign-fix
2008-05-03 14:30:22 UTC (rev 6841)
@@ -1,20 +0,0 @@
-Author: Eric S. Raymond <[EMAIL PROTECTED]> vim:ft=diff:
-Description: display an error message if no campaign is available
-
-Index: wesnoth-1.4.1/src/game.cpp
-===================================================================
---- wesnoth-1.4.1.orig/src/game.cpp
-+++ wesnoth-1.4.1/src/game.cpp
-@@ -896,10 +896,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);
Deleted:
packages/branches/wesnoth/experimental/debian/patches/05address-align-for-sparc
===================================================================
---
packages/branches/wesnoth/experimental/debian/patches/05address-align-for-sparc
2008-05-03 09:46:51 UTC (rev 6840)
+++
packages/branches/wesnoth/experimental/debian/patches/05address-align-for-sparc
2008-05-03 14:30:22 UTC (rev 6841)
@@ -1,23 +0,0 @@
-Author: Mark de Wever <[EMAIL PROTECTED]> vim:ft=diff:
-Description: Fixed an alignement issue which caused a SIGBUS on a Sparc
(debian bug #426318).
-
-Index: wesnoth-1.4.1/src/network_worker.cpp
-===================================================================
---- wesnoth-1.4.1.orig/src/network_worker.cpp
-+++ wesnoth-1.4.1/src/network_worker.cpp
-@@ -366,7 +366,15 @@ static SOCKET_STATE send_buffer(TCPsocke
-
- static SOCKET_STATE receive_buf(TCPsocket sock, std::vector<char>& buf)
- {
-+#ifdef __GNUC__
-+ // The address needs to be aligned on a Sparc system, if it's not
aligned
-+ // the SDLNet_Read32 call will cause a SIGBUS and the server will be
-+ // terminated.
-+ // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=426318
-+ char num_buf[4] __attribute__ ((aligned (4)));
-+#else
- char num_buf[4];
-+#endif
- bool res = receive_with_timeout(sock,num_buf,4,false);
-
- if(!res) {
Modified: packages/branches/wesnoth/experimental/debian/patches/series
===================================================================
--- packages/branches/wesnoth/experimental/debian/patches/series
2008-05-03 09:46:51 UTC (rev 6840)
+++ packages/branches/wesnoth/experimental/debian/patches/series
2008-05-03 14:30:22 UTC (rev 6841)
@@ -1,3 +1 @@
02wesnoth-nolog-desktop-file
-04no-campaign-fix
-05address-align-for-sparc
Modified: packages/branches/wesnoth/experimental/debian/wesnoth-data.install
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-data.install
2008-05-03 09:46:51 UTC (rev 6840)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-data.install
2008-05-03 14:30:22 UTC (rev 6841)
@@ -35,3 +35,4 @@
debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-tutorial.mo
debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-units.mo
debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth.mo
+debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-anl.mo
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
