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

[Gerfried Fuchs]

Author: alfie
Date: 2008-06-09 12:13:10 +0000 (Mon, 09 Jun 2008)
New Revision: 7319

Added:
   packages/trunk/wesnoth/debian/README.source
Removed:
   packages/trunk/wesnoth/debian/patches/04no-campaign-fix
   packages/trunk/wesnoth/debian/patches/05address-align-for-sparc
Modified:
   packages/trunk/wesnoth/debian/changelog
   packages/trunk/wesnoth/debian/control
   packages/trunk/wesnoth/debian/patches/series
Log:
 * New upstream release, incorporating the following two patches:
   no-campaign-fix, address-align-for-sparc. Removed them from patch series.
 * Finally switched Maintainer to Games Team.
 * Updated to Standards-Version 3.8.0:
   - Added README.source to package.


Added: packages/trunk/wesnoth/debian/README.source
===================================================================
--- packages/trunk/wesnoth/debian/README.source	                        (rev 0)
+++ packages/trunk/wesnoth/debian/README.source	2008-06-09 12:13:10 UTC (rev 7319)
@@ -0,0 +1,2 @@
+This package uses quilt for its patch management, see
+/usr/share/doc/quilt/README.source if you are unfamiliar with it.

Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog	2008-06-09 07:56:03 UTC (rev 7318)
+++ packages/trunk/wesnoth/debian/changelog	2008-06-09 12:13:10 UTC (rev 7319)
@@ -1,3 +1,13 @@
+wesnoth (1:1.4.3-1) unstable; urgency=low
+
+  * New upstream release, incorporating the following two patches:
+    no-campaign-fix, address-align-for-sparc. Removed them from patch series.
+  * Finally switched Maintainer to Games Team.
+  * Updated to Standards-Version 3.8.0:
+    - Added README.source to package.
+
+ -- Gerfried Fuchs <rhonda at debian.at>  Sun, 08 Jun 2008 21:26:24 +0200
+
 wesnoth (1:1.4.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/trunk/wesnoth/debian/control
===================================================================
--- packages/trunk/wesnoth/debian/control	2008-06-09 07:56:03 UTC (rev 7318)
+++ packages/trunk/wesnoth/debian/control	2008-06-09 12:13:10 UTC (rev 7319)
@@ -1,13 +1,13 @@
 Source: wesnoth
 Section: games
 Priority: optional
-Maintainer: Isaac Clerencia <isaac at debian.org>
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5), quilt, libsdl-image1.2-dev, libfreetype6-dev,
   libsdl-mixer1.2-dev, libsdl-net1.2-dev, libfribidi-dev, libsdl1.2-dev,
   python-dev (>= 2.3), python-support,
   libboost-iostreams-dev, libboost-test-dev
-Standards-Version: 3.7.3
-Uploaders: Cyril Bouthors <cyril at bouthors.org>, Gerfried Fuchs <rhonda at debian.at>
+Standards-Version: 3.8.0
+Uploaders: Isaac Clerencia <isaac at debian.org>, Cyril Bouthors <cyril at bouthors.org>, Gerfried Fuchs <rhonda at debian.at>
 Homepage: http://wesnoth.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/wesnoth/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/wesnoth/?op=log

Deleted: packages/trunk/wesnoth/debian/patches/04no-campaign-fix
===================================================================
--- packages/trunk/wesnoth/debian/patches/04no-campaign-fix	2008-06-09 07:56:03 UTC (rev 7318)
+++ packages/trunk/wesnoth/debian/patches/04no-campaign-fix	2008-06-09 12:13:10 UTC (rev 7319)
@@ -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.2/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));
- 	}
- 
--	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/trunk/wesnoth/debian/patches/05address-align-for-sparc
===================================================================
--- packages/trunk/wesnoth/debian/patches/05address-align-for-sparc	2008-06-09 07:56:03 UTC (rev 7318)
+++ packages/trunk/wesnoth/debian/patches/05address-align-for-sparc	2008-06-09 12:13:10 UTC (rev 7319)
@@ -1,23 +0,0 @@
-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.2/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)
- {
-+#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/trunk/wesnoth/debian/patches/series
===================================================================
--- packages/trunk/wesnoth/debian/patches/series	2008-06-09 07:56:03 UTC (rev 7318)
+++ packages/trunk/wesnoth/debian/patches/series	2008-06-09 12:13:10 UTC (rev 7319)
@@ -1,3 +1 @@
 02wesnoth-nolog-desktop-file
-04no-campaign-fix
-05address-align-for-sparc