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

[Gerfried Fuchs]

Author: alfie
Date: 2008-05-05 07:50:49 +0000 (Mon, 05 May 2008)
New Revision: 6857

Modified:
   packages/trunk/wesnoth/
   packages/trunk/wesnoth/debian/changelog
   packages/trunk/wesnoth/debian/patches/02wesnoth-nolog-desktop-file
   packages/trunk/wesnoth/debian/patches/04no-campaign-fix
   packages/trunk/wesnoth/debian/patches/05address-align-for-sparc
Log:
New upstream release.
patches refreshed



Property changes on: packages/trunk/wesnoth
___________________________________________________________________
Name: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/wesnoth_1.4.1.orig.tar.gz

   + http://pkg-games.alioth.debian.org/tarballs/wesnoth_1.4.2.orig.tar.gz


Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog	2008-05-04 21:01:22 UTC (rev 6856)
+++ packages/trunk/wesnoth/debian/changelog	2008-05-05 07:50:49 UTC (rev 6857)
@@ -1,5 +1,6 @@
-wesnoth (1:1.4.1-3) unstable; urgency=low
+wesnoth (1:1.4.2-1) unstable; urgency=low
 
+  * New upstream release.
   * Do postinst hooks only on upgrades from older versions than 1:1.4.1-2,
     also check wether it might be a symlink already and ignore rmdir error
     message.
@@ -8,7 +9,7 @@
   * Rename debian/NEWS.Debian to debian/NEWS which dh_installchangelogs likes
     to pick up and install as NEWS.Debian...
 
- -- Gerfried Fuchs <rhonda at debian.at>  Mon, 21 Apr 2008 18:42:21 +0200
+ -- Gerfried Fuchs <rhonda at debian.at>  Mon, 05 May 2008 09:36:53 +0200
 
 wesnoth (1:1.4.1-2) unstable; urgency=low
 

Modified: packages/trunk/wesnoth/debian/patches/02wesnoth-nolog-desktop-file
===================================================================
--- packages/trunk/wesnoth/debian/patches/02wesnoth-nolog-desktop-file	2008-05-04 21:01:22 UTC (rev 6856)
+++ packages/trunk/wesnoth/debian/patches/02wesnoth-nolog-desktop-file	2008-05-05 07:50:49 UTC (rev 6857)
@@ -1,10 +1,10 @@
 Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
 Description: call wesnoth-nolog from desktop file, too
 
-Index: wesnoth-1.4.1/icons/wesnoth.desktop
+Index: wesnoth-1.4.2/icons/wesnoth.desktop
 ===================================================================
---- wesnoth-1.4.1.orig/icons/wesnoth.desktop
-+++ wesnoth-1.4.1/icons/wesnoth.desktop
+--- wesnoth-1.4.2.orig/icons/wesnoth.desktop
++++ wesnoth-1.4.2/icons/wesnoth.desktop
 @@ -44,6 +44,6 @@ Comment[sk]=Ťahová strategická hra z 
  Comment[sr]=Фантазијска стратешка игра на потезе
  Comment[sr at latin]=Fantazijska strateška igra na poteze

Modified: packages/trunk/wesnoth/debian/patches/04no-campaign-fix
===================================================================
--- packages/trunk/wesnoth/debian/patches/04no-campaign-fix	2008-05-04 21:01:22 UTC (rev 6856)
+++ packages/trunk/wesnoth/debian/patches/04no-campaign-fix	2008-05-05 07:50:49 UTC (rev 6857)
@@ -1,10 +1,10 @@
 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.1/src/game.cpp
+Index: wesnoth-1.4.2/src/game.cpp
 ===================================================================
---- wesnoth-1.4.1.orig/src/game.cpp
-+++ wesnoth-1.4.1/src/game.cpp
+--- wesnoth-1.4.2.orig/src/game.cpp
++++ wesnoth-1.4.2/src/game.cpp
 @@ -896,10 +896,11 @@ bool game_controller::new_campaign()
  		campaign_desc.push_back(std::pair<std::string,std::string>(desc,image));
  	}

Modified: packages/trunk/wesnoth/debian/patches/05address-align-for-sparc
===================================================================
--- packages/trunk/wesnoth/debian/patches/05address-align-for-sparc	2008-05-04 21:01:22 UTC (rev 6856)
+++ packages/trunk/wesnoth/debian/patches/05address-align-for-sparc	2008-05-05 07:50:49 UTC (rev 6857)
@@ -1,10 +1,10 @@
 Author: Mark de Wever <koraq at xs4all.nl>	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
+Index: wesnoth-1.4.2/src/network_worker.cpp
 ===================================================================
---- wesnoth-1.4.1.orig/src/network_worker.cpp
-+++ wesnoth-1.4.1/src/network_worker.cpp
+--- wesnoth-1.4.2.orig/src/network_worker.cpp
++++ wesnoth-1.4.2/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)