[SCM] single/multiplayer lobby for the Spring RTS engine branch, master, updated. debian/0.40-1-7-g7c33c69

[Marco Amadori]

The following commit has been merged in the master branch:
commit 476645cd8c3480fe65081832375feff2fd70677f
Author: Marco Amadori <marco.amadori at gmail.com>
Date:   Tue Dec 15 11:32:32 2009 +0100

    Included a (patched) upstream git patch to fix locales.

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..496a070
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,3 @@
+This package uses quilt to handle patches to upstream sources.
+
+Look at /usr/share/doc/quilt/README.source for more informations.
diff --git a/debian/control b/debian/control
index e2f1eee..d5e30ff 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Marco Amadori <marco.amadori at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), cmake, libwxgtk2.8-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, asciidoc, xsltproc, docbook-xsl
+Build-Depends: debhelper (>= 7.0.50~), cmake, libwxgtk2.8-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, asciidoc, xsltproc, docbook-xsl, quilt
 Standards-Version: 3.8.3
 Homepage: http://springlobby.info
 Vcs-Browser: http://git.debian.org/?p=pkg-games/springlobby.git;a=summary
diff --git a/debian/patches/0001-properly-define-LOCALE_INSTALL_DIR.patch b/debian/patches/0001-properly-define-LOCALE_INSTALL_DIR.patch
new file mode 100644
index 0000000..a97ec4f
--- /dev/null
+++ b/debian/patches/0001-properly-define-LOCALE_INSTALL_DIR.patch
@@ -0,0 +1,41 @@
+From 574ba70663a8dd71bb2447c8fc6ad5a0f4ec9287 Mon Sep 17 00:00:00 2001
+From: Rene Milk <koshi at springlobby.info>
+Date: Tue, 15 Dec 2009 22:50:02 +0100
+Subject: [PATCH] properly define LOCALE_INSTALL_DIR
+
+---
+ CMakeLists.txt         |    2 +-
+ src/springlobbyapp.cpp |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6b86d6d..89db64d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -209,7 +209,7 @@ ENDIF(WIN32)
+ if( OPTION_TRANSLATION_SUPPORT )
+ 	include ( ${CMAKE_SOURCE_DIR}/po/CMakeLists.txt )
+ endif( OPTION_TRANSLATION_SUPPORT )
+-
++ADD_DEFINITIONS( -DLOCALE_INSTALL_DIR="${LOCALE_INSTALL_DIR}" )
+ #----------------------------------------------------------------------------------------------------
+ # Build target defintions
+ #----------------------------------------------------------------------------------------------------
+diff --git a/src/springlobbyapp.cpp b/src/springlobbyapp.cpp
+index 8144ff0..4443374 100644
+--- a/src/springlobbyapp.cpp
++++ b/src/springlobbyapp.cpp
+@@ -112,8 +112,8 @@ bool SpringLobbyApp::OnInit()
+ #ifdef __WXMSW__
+     wxString path = wxPathOnly( wxStandardPaths::Get().GetExecutablePath() ) + wxFileName::GetPathSeparator() + _T("locale");
+ #else
+-	#if defined(LOCALEDIR)
+-		wxString path ( _T(LOCALEDIR) );
++	#if defined(LOCALE_INSTALL_DIR)
++		wxString path ( _T(LOCALE_INSTALL_DIR) );
+ 	#else
+ 		// use a dummy name here, we're only interested in the base path
+ 		wxString path = wxStandardPaths::Get().GetLocalizedResourcesDir(_T("noneWH"),wxStandardPaths::ResourceCat_Messages);
+-- 
+1.6.5.4
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a228202
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-properly-define-LOCALE_INSTALL_DIR.patch
diff --git a/debian/rules b/debian/rules
index b825195..1e7c343 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,4 +47,4 @@ override_dh_auto_clean:
 	$(MAKE) -C debian/manpages clean
 
 %:
-	+dh --buildsystem=cmake $@
+	+dh --buildsystem=cmake --with quilt $@

-- 
single/multiplayer lobby for the Spring RTS engine