[SCM] single/multiplayer lobby for the Spring RTS engine branch, master, updated. 674ebd19aaa21beb4fe47d00aed9fa600abe7dc2
Marco Amadori
marco.amadori at gmail.com
Tue Nov 3 00:16:59 UTC 2009
The following commit has been merged in the master branch:
commit 674ebd19aaa21beb4fe47d00aed9fa600abe7dc2
Author: Marco Amadori <marco.amadori at gmail.com>
Date: Tue Nov 3 01:04:11 2009 +0100
New upstream release.
* Removed all debian/patches since they got merged upstream.
diff --git a/debian/changelog b/debian/changelog
index 2d404f2..d80db95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-springlobby (0.33-1) unstable; urgency=low
+springlobby (0.34-1) unstable; urgency=low
* Initial release (Closes: #550250).
* This release has p2p disabled due to openssl license conflicts, look at
README.Debian.
- -- Marco Amadori <marco.amadori at gmail.com> Mon, 02 Nov 2009 20:30:00 +0100
+ -- Marco Amadori <marco.amadori at gmail.com> Tue, 03 Nov 2009 01:00:00 +0100
diff --git a/debian/control b/debian/control
index e0f4774..46c1485 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~), quilt (>= 0.40), libwxgtk2.8-dev, libstdc++6-4.3-dev | libstdc++-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, asciidoc, xsltproc, docbook-xsl
+Build-Depends: debhelper (>= 7.0.50~), libwxgtk2.8-dev, libstdc++6-4.3-dev | libstdc++-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, asciidoc, xsltproc, docbook-xsl
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/00_change_linux_libunitsync_filename.patch b/debian/patches/00_change_linux_libunitsync_filename.patch
deleted file mode 100644
index 6e7cf4c..0000000
--- a/debian/patches/00_change_linux_libunitsync_filename.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-This patch tells SpringLobby to search for "libunitsync.so" file
- instead of "unitsync.so" which is a non standard name on linux.
-diff --git a/po/ar.po b/po/ar.po
-index 47cf9e1..ae59a02 100644
---- a/po/ar.po
-+++ b/po/ar.po
-@@ -4549,7 +4549,7 @@ msgid "Use this path"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:53
-diff --git a/po/cs.po b/po/cs.po
-index 825c838..5835b00 100644
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -4721,7 +4721,7 @@ msgid "Use this path"
- msgstr "Použít tuto cestu"
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:53
-diff --git a/po/da.po b/po/da.po
-index 8990c69..4914a5c 100644
---- a/po/da.po
-+++ b/po/da.po
-@@ -4609,7 +4609,7 @@ msgid "Use this path"
- msgstr "Brug denne sti"
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:53
-diff --git a/po/de.po b/po/de.po
-index 487fa6a..89c7c3b 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -4753,8 +4753,8 @@ msgid "Use this path"
- msgstr "Benutze diesen Pfad"
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
--msgstr "unitsync.so unter linux, unitsync.dll unter windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
-+msgstr "libunitsync.so unter linux, unitsync.dll unter windows"
-
- #: src/settings++/panel_pathoption.cpp:53
- msgid "Path settings"
-diff --git a/po/el.po b/po/el.po
-index b156d53..05bd4b5 100644
---- a/po/el.po
-+++ b/po/el.po
-@@ -4793,8 +4793,8 @@ msgid "Use this path"
- msgstr "Χρήση αυτής της διαδρομής"
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
--msgstr "unitsync.so στο Linux, unitsync.dll στα Windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
-+msgstr "libunitsync.so στο Linux, unitsync.dll στα Windows"
-
- #: src/settings++/panel_pathoption.cpp:53
- msgid "Path settings"
-diff --git a/po/en_US.po b/po/en_US.po
-index a063d88..8a57022 100644
---- a/po/en_US.po
-+++ b/po/en_US.po
-@@ -4740,8 +4740,8 @@ msgid "Use this path"
- msgstr "Use this path"
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
--msgstr "unitsync.so on linux, unitsync.dll on windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
-+msgstr "libunitsync.so on linux, unitsync.dll on windows"
-
- #: src/settings++/panel_pathoption.cpp:53
- msgid "Path settings"
-diff --git a/po/es.po b/po/es.po
-index 17f8a1e..5833ad8 100644
---- a/po/es.po
-+++ b/po/es.po
-@@ -4605,7 +4605,7 @@ msgid "Use this path"
- msgstr "Usar esta ruta"
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:53
-diff --git a/po/fi.po b/po/fi.po
-index 26596eb..9703c5e 100644
---- a/po/fi.po
-+++ b/po/fi.po
-@@ -4653,7 +4653,7 @@ msgid "Use this path"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:53
-diff --git a/po/fr.po b/po/fr.po
-index 7029f87..98f68e5 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -4703,8 +4703,8 @@ msgid "Use this path"
- msgstr "Utiliser ce chemin"
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
--msgstr "unitsync.so sous Linux, unitsync.dll sous Windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
-+msgstr "libunitsync.so sous Linux, unitsync.dll sous Windows"
-
- #: src/settings++/panel_pathoption.cpp:53
- msgid "Path settings"
-diff --git a/po/it.po b/po/it.po
-index c418865..f5dab6e 100644
---- a/po/it.po
-+++ b/po/it.po
-@@ -4710,8 +4710,8 @@ msgid "Use this path"
- msgstr "Usa questo percorso"
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
--msgstr "\"unitsync.so\" su Linux, \"unitsync.dll\" su Windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
-+msgstr "\"libunitsync.so\" su Linux, \"unitsync.dll\" su Windows"
-
- #: src/settings++/panel_pathoption.cpp:53
- msgid "Path settings"
-diff --git a/po/pl.po b/po/pl.po
-index 0991f69..c14b91e 100644
---- a/po/pl.po
-+++ b/po/pl.po
-@@ -4556,7 +4556,7 @@ msgid "Use this path"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:53
-diff --git a/po/pt.po b/po/pt.po
-index 1085bf5..45128df 100644
---- a/po/pt.po
-+++ b/po/pt.po
-@@ -4667,7 +4667,7 @@ msgid "Use this path"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:53
-diff --git a/po/ro.po b/po/ro.po
-index 37644f4..f605b9b 100644
---- a/po/ro.po
-+++ b/po/ro.po
-@@ -4781,8 +4781,8 @@ msgid "Use this path"
- msgstr "Foloseşte calea"
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
--msgstr "unitsync.so pe linux, unitsync.dll pe windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
-+msgstr "libunitsync.so pe linux, unitsync.dll pe windows"
-
- #: src/settings++/panel_pathoption.cpp:53
- msgid "Path settings"
-diff --git a/po/ru.po b/po/ru.po
-index ba42be6..9f5fa12 100644
---- a/po/ru.po
-+++ b/po/ru.po
-@@ -4808,8 +4808,8 @@ msgid "Use this path"
- msgstr "Исп. этот путь"
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
--msgstr "unitsync.so в linux, unitsync.dll в windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
-+msgstr "libunitsync.so в linux, unitsync.dll в windows"
-
- #: src/settings++/panel_pathoption.cpp:53
- msgid "Path settings"
-diff --git a/po/springlobby.pot b/po/springlobby.pot
-index aeced51..10578ee 100644
---- a/po/springlobby.pot
-+++ b/po/springlobby.pot
-@@ -4458,7 +4458,7 @@ msgid "Use this path"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:53
-diff --git a/po/sv.po b/po/sv.po
-index 89bd8f4..bf69553 100644
---- a/po/sv.po
-+++ b/po/sv.po
-@@ -4662,7 +4662,7 @@ msgid "Use this path"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:53
-diff --git a/po/uk.po b/po/uk.po
-index d3669d1..586d7ee 100644
---- a/po/uk.po
-+++ b/po/uk.po
-@@ -4516,7 +4516,7 @@ msgid "Use this path"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
- msgstr ""
-
- #: src/settings++/panel_pathoption.cpp:53
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index b21d368..76acf1f 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -4753,8 +4753,8 @@ msgid "Use this path"
- msgstr "使用该路径"
-
- #: src/settings++/panel_pathoption.cpp:47
--msgid "unitsync.so on linux, unitsync.dll on windows"
--msgstr "Linux中的unitsync.so Windows中的unitsync.dll"
-+msgid "libunitsync.so on linux, unitsync.dll on windows"
-+msgstr "Linux中的libunitsync.so Windows中的unitsync.dll"
-
- #: src/settings++/panel_pathoption.cpp:53
- msgid "Path settings"
-diff --git a/src/settings++/panel_pathoption.cpp b/src/settings++/panel_pathoption.cpp
-index de225fe..e4bc0b3 100644
---- a/src/settings++/panel_pathoption.cpp
-+++ b/src/settings++/panel_pathoption.cpp
-@@ -44,7 +44,7 @@ PathOptionPanel::PathOptionPanel(wxWindow* parent,settings_frame* _origin) : wxP
-
-
- usync_ctrl = new wxTextCtrl(this,-1, sett().GetCurrentUsedUnitSync(), wxDefaultPosition,wxSize(400,-1));
-- usync_ctrl->SetToolTip(_("unitsync.so on linux, unitsync.dll on windows"));
-+ usync_ctrl->SetToolTip(_("libunitsync.so on linux, unitsync.dll on windows"));
-
- usync_sizer = new wxFlexGridSizer(1,5,5);
-
-@@ -73,9 +73,15 @@ PathOptionPanel::PathOptionPanel(wxWindow* parent,settings_frame* _origin) : wxP
- void PathOptionPanel::SetUsyncPath(wxCommandEvent& /*unused*/)
- {
- wxString lib_ext = wxDynamicLibrary::CanonicalizeName(_T(""), wxDL_MODULE);
-+#if defined(__MINGW32__) || defined(__linux__) || defined(__unix__)
-+ wxString lib_pre = _T("lib");
-+#else
-+ wxString lib_pre = _T("");
-+#endif
-+
- wxFileDialog pic( this, _("Choose an unitsync library"),
- wxPathOnly( sett().AutoFindSpringBin() ),
-- _T("unitsync") + lib_ext, wxString(_T("Library")) + _T("(*") + lib_ext + _T(")|*") + lib_ext + _T("|") + wxString(_("Any File")) + _T(" (*.*)|*.*") );
-+ lib_pre + _T("unitsync") + lib_ext, wxString(_T("Library")) + _T("(*") + lib_ext + _T(")|*") + lib_ext + _T("|") + wxString(_("Any File")) + _T(" (*.*)|*.*") );
- if ( pic.ShowModal() == wxID_OK )
- usync_ctrl->SetValue( pic.GetPath() );
- }
diff --git a/debian/patches/01_add_more_libunitsync_search_paths.patch b/debian/patches/01_add_more_libunitsync_search_paths.patch
deleted file mode 100644
index c02f46d..0000000
--- a/debian/patches/01_add_more_libunitsync_search_paths.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Add two more search paths for libunitsync discover.
---- springlobby-0.28.orig/src/settings.cpp
-+++ springlobby-0.28/src/settings.cpp
-@@ -832,12 +832,14 @@
- pl.AddEnvList( _T( "LDPATH" ) );
- pl.AddEnvList( _T( "LD_LIBRARY_PATH" ) );
-
-+ pl.Add( _T( "/usr/local/lib/spring" ) );
- pl.Add( _T( "/usr/local/lib64" ) );
- pl.Add( _T( "/usr/local/games" ) );
- pl.Add( _T( "/usr/local/games/lib" ) );
- pl.Add( _T( "/usr/local/lib" ) );
- pl.Add( _T( "/usr/lib64" ) );
- pl.Add( _T( "/usr/lib" ) );
-+ pl.Add( _T( "/usr/lib/spring" ) );
- pl.Add( _T( "/usr/games" ) );
- pl.Add( _T( "/usr/games/lib64" ) );
- pl.Add( _T( "/usr/games/lib" ) );
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 35e75c1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-00_change_linux_libunitsync_filename.patch
-01_add_more_libunitsync_search_paths.patch
diff --git a/debian/rules b/debian/rules
index 42b20bf..df21db3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,4 +30,4 @@ override_dh_auto_clean:
$(MAKE) -C debian/manpages clean
%:
- +dh --with quilt $@
+ +dh $@
--
single/multiplayer lobby for the Spring RTS engine
More information about the Pkg-games-commits
mailing list