[SCM] single/multiplayer lobby for the Spring RTS engine branch, master, updated. 28165f47675c144b846786b0435aa7f9b3396209
Marco Amadori
marco.amadori at gmail.com
Tue Oct 27 16:02:38 UTC 2009
The following commit has been merged in the master branch:
commit 4a91db012fd701960c7a601be37a2c40854f5588
Author: Marco Amadori <marco.amadori at gmail.com>
Date: Tue Oct 27 15:20:22 2009 +0100
Refreshed a quilt patch after upstream 0.33
diff --git a/debian/patches/00_change_linux_libunitsync_filename.patch b/debian/patches/00_change_linux_libunitsync_filename.patch
index 0d380b0..6e7cf4c 100644
--- a/debian/patches/00_change_linux_libunitsync_filename.patch
+++ b/debian/patches/00_change_linux_libunitsync_filename.patch
@@ -1,37 +1,37 @@
This patch tells SpringLobby to search for "libunitsync.so" file
instead of "unitsync.so" which is a non standard name on linux.
---- springlobby-0.28.orig/src/settings++/panel_pathoption.cpp
-+++ springlobby-0.28/src/settings++/panel_pathoption.cpp
-@@ -44,7 +44,7 @@
+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 ""
- 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"));
+ #: 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"
- usync_sizer = new wxFlexGridSizer(1,5,5);
+ #: 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 ""
-@@ -73,9 +73,15 @@
- 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() );
- }
---- springlobby-0.28.orig/po/cs.po
-+++ springlobby-0.28/po/cs.po
-@@ -5060,7 +5060,7 @@
- msgstr "Použít tuto cestu"
+ #: 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"
@@ -39,9 +39,11 @@ This patch tells SpringLobby to search for "libunitsync.so" file
msgstr ""
#: src/settings++/panel_pathoption.cpp:53
---- springlobby-0.28.orig/po/de.po
-+++ springlobby-0.28/po/de.po
-@@ -5093,8 +5093,8 @@
+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
@@ -52,32 +54,42 @@ This patch tells SpringLobby to search for "libunitsync.so" file
#: src/settings++/panel_pathoption.cpp:53
msgid "Path settings"
---- springlobby-0.28.orig/po/da.po
-+++ springlobby-0.28/po/da.po
-@@ -4948,7 +4948,7 @@
- msgstr "Brug denne sti"
+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 ""
++msgstr "libunitsync.so στο Linux, unitsync.dll στα Windows"
#: src/settings++/panel_pathoption.cpp:53
---- springlobby-0.28.orig/po/es.po
-+++ springlobby-0.28/po/es.po
-@@ -4946,7 +4946,7 @@
- msgstr "Usar esta ruta"
+ 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 ""
++msgstr "libunitsync.so on linux, unitsync.dll on windows"
#: src/settings++/panel_pathoption.cpp:53
---- springlobby-0.28.orig/po/uk.po
-+++ springlobby-0.28/po/uk.po
-@@ -4857,7 +4857,7 @@
- msgstr ""
+ 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"
@@ -85,48 +97,54 @@ This patch tells SpringLobby to search for "libunitsync.so" file
msgstr ""
#: src/settings++/panel_pathoption.cpp:53
---- springlobby-0.28.orig/po/zh_CN.po
-+++ springlobby-0.28/po/zh_CN.po
-@@ -5093,8 +5093,8 @@
- msgstr "使用该路径"
+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"
--msgstr "Linux中的unitsync.so Windows中的unitsync.dll"
+msgid "libunitsync.so on linux, unitsync.dll on windows"
-+msgstr "Linux中的libunitsync.so Windows中的unitsync.dll"
+ msgstr ""
#: src/settings++/panel_pathoption.cpp:53
- msgid "Path settings"
---- springlobby-0.28.orig/po/en_US.po
-+++ springlobby-0.28/po/en_US.po
-@@ -5079,8 +5079,8 @@
- msgstr "Use this path"
+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 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 on linux, unitsync.dll on windows"
++msgstr "libunitsync.so sous Linux, unitsync.dll sous Windows"
#: src/settings++/panel_pathoption.cpp:53
msgid "Path settings"
---- springlobby-0.28.orig/po/ro.po
-+++ springlobby-0.28/po/ro.po
-@@ -5121,8 +5121,8 @@
- msgstr "Foloseşte calea"
+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 pe linux, unitsync.dll pe windows"
+-msgstr "\"unitsync.so\" su Linux, \"unitsync.dll\" su Windows"
+msgid "libunitsync.so on linux, unitsync.dll on windows"
-+msgstr "libunitsync.so pe linux, unitsync.dll pe windows"
++msgstr "\"libunitsync.so\" su Linux, \"unitsync.dll\" su Windows"
#: src/settings++/panel_pathoption.cpp:53
msgid "Path settings"
---- springlobby-0.28.orig/po/sv.po
-+++ springlobby-0.28/po/sv.po
-@@ -5001,7 +5001,7 @@
+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
@@ -135,9 +153,11 @@ This patch tells SpringLobby to search for "libunitsync.so" file
msgstr ""
#: src/settings++/panel_pathoption.cpp:53
---- springlobby-0.28.orig/po/pt.po
-+++ springlobby-0.28/po/pt.po
-@@ -5007,7 +5007,7 @@
+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
@@ -146,20 +166,26 @@ This patch tells SpringLobby to search for "libunitsync.so" file
msgstr ""
#: src/settings++/panel_pathoption.cpp:53
---- springlobby-0.28.orig/po/ar.po
-+++ springlobby-0.28/po/ar.po
-@@ -4889,7 +4889,7 @@
- msgstr ""
+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 ""
++msgstr "libunitsync.so pe linux, unitsync.dll pe windows"
#: src/settings++/panel_pathoption.cpp:53
---- springlobby-0.28.orig/po/ru.po
-+++ springlobby-0.28/po/ru.po
-@@ -5146,8 +5146,8 @@
+ 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
@@ -170,9 +196,11 @@ This patch tells SpringLobby to search for "libunitsync.so" file
#: src/settings++/panel_pathoption.cpp:53
msgid "Path settings"
---- springlobby-0.28.orig/po/fi.po
-+++ springlobby-0.28/po/fi.po
-@@ -4991,7 +4991,7 @@
+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
@@ -181,22 +209,24 @@ This patch tells SpringLobby to search for "libunitsync.so" file
msgstr ""
#: src/settings++/panel_pathoption.cpp:53
---- springlobby-0.28.orig/po/el.po
-+++ springlobby-0.28/po/el.po
-@@ -5134,8 +5134,8 @@
- msgstr "Χρήση αυτής της διαδρομής"
+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"
--msgstr "unitsync.so στο Linux, unitsync.dll στα Windows"
+msgid "libunitsync.so on linux, unitsync.dll on windows"
-+msgstr "libunitsync.so στο Linux, unitsync.dll στα Windows"
+ msgstr ""
#: src/settings++/panel_pathoption.cpp:53
- msgid "Path settings"
---- springlobby-0.28.orig/po/pl.po
-+++ springlobby-0.28/po/pl.po
-@@ -4896,7 +4896,7 @@
+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
@@ -205,40 +235,48 @@ This patch tells SpringLobby to search for "libunitsync.so" file
msgstr ""
#: src/settings++/panel_pathoption.cpp:53
---- springlobby-0.28.orig/po/it.po
-+++ springlobby-0.28/po/it.po
-@@ -5049,8 +5049,8 @@
- msgstr "Usa questo percorso"
+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 "\"unitsync.so\" su Linux, \"unitsync.dll\" su Windows"
+-msgstr "Linux中的unitsync.so Windows中的unitsync.dll"
+msgid "libunitsync.so on linux, unitsync.dll on windows"
-+msgstr "\"libunitsync.so\" su Linux, \"unitsync.dll\" su Windows"
++msgstr "Linux中的libunitsync.so Windows中的unitsync.dll"
#: src/settings++/panel_pathoption.cpp:53
msgid "Path settings"
---- springlobby-0.28.orig/po/fr.po
-+++ springlobby-0.28/po/fr.po
-@@ -5041,8 +5041,8 @@
- msgstr "Utiliser ce chemin"
+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
- #: 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"
---- springlobby-0.28.orig/po/springlobby.pot
-+++ springlobby-0.28/po/springlobby.pot
-@@ -4798,7 +4798,7 @@
- msgstr ""
+ 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"));
- #: 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 ""
+ usync_sizer = new wxFlexGridSizer(1,5,5);
- #: src/settings++/panel_pathoption.cpp:53
+@@ -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() );
+ }
--
single/multiplayer lobby for the Spring RTS engine
More information about the Pkg-games-commits
mailing list