Commit ce50961a2da2d0e6728a1a74d47fe5c004343e75 - freespace2-launcher-wxlauncher

+11

-0

debian/changelog less more

	0	freespace2-launcher-wxlauncher (0.9.5-1) UNRELEASED; urgency=low
	1
	2	* New upstream release [February 2015].
	3	* New project's URLs in d/watch and d/copyright and d/control.
	4	* New style Vcs-Browser link.
	5	* Standards-Version: 3.9.6.
	6	* Dropped obsolete "wx3.0-compat.patch".
	7	* Added new "fix-al-includes.patch" and "fix-wx3-build.patch".
	8
	9	-- Dmitry Smirnov <onlyjob@debian.org> Sat, 14 Mar 2015 14:09:35 +1100
	10
0	11	freespace2-launcher-wxlauncher (0.9.4-2) unstable; urgency=low
1	12
2	13	[ Olly Betts <olly@survex.com> ]

+1

-1

debian/control less more

9	9	,python
10	10	,python-markdown
11	11	Standards-Version: 3.9.6
12		Homepage: https://code.google.com/p/wxlauncher/
	12	Homepage: https://github.com/wxLauncher/wxlauncher/
13	13	Vcs-Browser: http://anonscm.debian.org/cgit/users/onlyjob/freespace2-launcher-wxlauncher.git
14	14	Vcs-Git: git://anonscm.debian.org/users/onlyjob/freespace2-launcher-wxlauncher.git
15	15

+9

-9

debian/copyright less more

0	0	Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
1	1	Upstream-Name: wxlauncher
2		Source: https://code.google.com/p/wxlauncher/
3
4		Files: debian/*
5		Copyright: 2012-2014 Dmitry Smirnov <onlyjob@debian.org>
	2	Source: https://github.com/wxLauncher/wxlauncher/
	3
	4	Files: *
	5	Copyright: 2009-2015 wxLauncher Team
6	6	License: GPL-2+
7	7
8		Files: *
9		Copyright: 2009-2013 wxLauncher Team
10		License: GPL-2+
11
12		Files: icon*
	8	Files: resources/icon*
13	9	Copyright: 2005 Mark James <mjames@gmail.com>
14	10	License: CC-BY-3.0
15	11	Comment:

21	17	of the Silk icon set contents within a readme file or equivalent
22	18	documentation for the software which includes the set or a subset
23	19	of the icons contained within.
	20
	21	Files: debian/*
	22	Copyright: 2012-2015 Dmitry Smirnov <onlyjob@debian.org>
	23	License: GPL-2+
24	24
25	25	License: GPL-2+
26	26	This program is free software: you can redistribute it and/or modify

+1

-1

debian/patches/debian-path.patch less more

4	4
5	5	--- a/CMakeLists.txt
6	6	+++ b/CMakeLists.txt
7		@@ -65,9 +65,9 @@
	7	@@ -75,9 +75,9 @@
8	8	set(RESOURCES_PATH resources)
9	9	elseif(IS_APPLE)
10	10	set(RESOURCES_PATH wxlauncher.app/Contents/Resources)

+28

-0

debian/patches/fix-al-includes.patch less more

	0	Last-Update: 2015-02-07
	1	Origin: upstream, https://github.com/wxLauncher/wxlauncher/commit/7d1faecf16ddcd09b276e18fb327d88d4dc37e64
	2	From: Iss Mneur <iss.mneur@issmneur.ca>
	3	Description: Revert changes to al.h and alc.h location
	4	wxWidgets find_package looks for al.h and alc.h because
	5	the folder they are in is not consitent across platforms.
	6	See the FindOpenAL.cmake file in your cmake distrobution for
	7	more information.
	8
	9	--- a/code/apis/OpenALManager.cpp
	10	+++ b/code/apis/OpenALManager.cpp
	11	@@ -24,10 +24,14 @@
	12	#include "apis/ProfileManager.h"
	13	#include "global/ProfileKeys.h"
	14
	15	#if USE_OPENAL
	16	-#include <al/al.h>
	17	-#include <al/alc.h>
	18	+/* Include al.h because the wxWidgets FindPackage searches for al.h
	19	+ * because otherwise it moves around on different platforms.
	20	+ * See the FindOpenAL.cmake file in your CMake distribution for
	21	+ * more information. */
	22	+#include <al.h>
	23	+#include <alc.h>
	24	#endif
	25
	26	#include "global/MemoryDebugging.h"
	27

+20

-0

debian/patches/fix-wx3-build.patch less more

	0	Last-Update: 2015-03-01
	1	Origin: upstream, https://github.com/wxLauncher/wxlauncher/commit/f379630f17ba3d6632e8ec78686936e9081b6e55
	2	From: Iss Mneur <iss.mneur@issmneur.ca>
	3	Description: Terinary operator requires sames types on both sides
	4	When built with wxWidgets 3.0, gcc rightly flags this abuse
	5	of variable args and mismatched types (wxString vs CStrData).
	6
	7	--- a/code/controls/ModList.cpp
	8	+++ b/code/controls/ModList.cpp
	9	@@ -1351,9 +1351,9 @@
	10	links->SetPage(wxString::Format(_T("<center>%s%s%s%s</center>"),
	11	(!item->website.IsEmpty()) ?
	12	wxString::Format(_T("<a href='%s'>%s</a> :: "), item->website.c_str(), _("Website")).c_str():wxEmptyString,
	13	wxString::Format(_T("<a href='%s'>%s</a>"), (!item->forum.IsEmpty()) ?
	14	- item->forum.c_str():_("http://www.hard-light.net/forums/index.php?board=124.0"), _("Forum")).c_str(),
	15	+ item->forum.c_str():_("http://www.hard-light.net/forums/index.php?board=124.0").c_str(), _("Forum").c_str()).c_str(),
	16	(!item->bugs.IsEmpty()) ?
	17	wxString::Format(_T(" :: <a href='%s'>%s</a>"), item->bugs.c_str(), _("Bugs")).c_str() : wxEmptyString,
	18	(!item->support.IsEmpty()) ?
	19	wxString::Format(_T(" :: <a href='%s'>%s</a>"), item->support.c_str(), _("Support")).c_str() : wxEmptyString

+2

-1

debian/patches/series less more

0	0	debian-path.patch
	1	fix-al-includes.patch
	2	fix-wx3-build.patch
1	3	issue_93.patch
2		wx3.0-compat.patch

+0

-94

~~debian/patches/wx3.0-compat.patch~~ less more

0		Description: Fixes for wxwidgets 3.0 compatibility
1		Author: Olly Betts <olly@survex.com>
2		Bug-Debian: https://bugs.debian.org/749834
3		Forwarded: https://code.google.com/p/wxlauncher/issues/detail?id=110
4		Last-Update: 2014-08-30
5
6		--- a/code/controls/ModList.cpp
7		+++ b/code/controls/ModList.cpp
8		@@ -1350,10 +1350,10 @@
9		links->SetSize(SkinSystem::ModInfoDialogImageWidth, 40);
10		links->SetPage(wxString::Format(_T("<center>%s%s%s%s</center>"),
11		(!item->website.IsEmpty()) ?
12		wxString::Format(_T("<a href='%s'>%s</a> :: "), item->website.c_str(), _("Website")).c_str():wxEmptyString,
13		- wxString::Format(_T("<a href='%s'>%s</a>"), (!item->forum.IsEmpty()) ?
14		- item->forum.c_str():_("http://www.hard-light.net/forums/index.php?board=124.0"), _("Forum")).c_str(),
15		+ wxString::Format(_T("<a href='%s'>%s</a>"), (!item->forum.IsEmpty() ?
16		+ item->forum:_("http://www.hard-light.net/forums/index.php?board=124.0")).c_str(), _("Forum")).c_str(),
17		(!item->bugs.IsEmpty()) ?
18		wxString::Format(_T(" :: <a href='%s'>%s</a>"), item->bugs.c_str(), _("Bugs")).c_str() : wxEmptyString,
19		(!item->support.IsEmpty()) ?
20		wxString::Format(_T(" :: <a href='%s'>%s</a>"), item->support.c_str(), _("Support")).c_str() : wxEmptyString
21		--- a/code/apis/HelpManager.cpp
22		+++ b/code/apis/HelpManager.cpp
23		@@ -58,9 +58,9 @@
24		wxFileName file(_T(HELP_HTB_LOCATION));
25		if ( file.FileExists() ) {
26		controller->AddBook(file, false);
27		} else {
28		- ::wxLogWarning(_T("Unable to find help file %s"), file.GetFullName().c_str());
29		+ wxLogWarning(_T("Unable to find help file %s"), file.GetFullName().c_str());
30		delete controller;
31		controller = NULL;
32		return false;
33		}
34		@@ -92,9 +92,9 @@
35		HelpManager::helpLinks[i].location);
36		return;
37		}
38		}
39		- ::wxLogInfo(_T(" ID %d does not have more specific help"), id);
40		+ wxLogInfo(_T(" ID %d does not have more specific help"), id);
41		}
42
43		void HelpManager::OpenMainHelpPage() {
44		wxCHECK_RET( HelpManager::IsInitialized(), _T("Help is not initialized"));
45		--- a/code/apis/ProfileManager.cpp
46		+++ b/code/apis/ProfileManager.cpp
47		@@ -307,10 +307,10 @@
48
49		while (groupKeepGoing) {
50		globalProfile->SetPath(groupName);
51
52		- if (globalProfile->Read(GBL_CFG_NET_THE_NEWS, theNews) &&
53		- (globalProfile->Read(GBL_CFG_NET_NEWS_LAST_TIME, lastDownloadNewsStr))) {
54		+ if (globalProfile->Read(GBL_CFG_NET_THE_NEWS, &theNews) &&
55		+ (globalProfile->Read(GBL_CFG_NET_NEWS_LAST_TIME, &lastDownloadNewsStr))) {
56		if ((!theNews.IsEmpty()) &&
57		(NULL != lastDownloadNews.ParseFormat(
58		lastDownloadNewsStr, NEWS_LAST_TIME_FORMAT))) {
59		newsMap[groupName] = NewsData(theNews, lastDownloadNews);
60		--- a/code/wxLauncherApp.cpp
61		+++ b/code/wxLauncherApp.cpp
62		@@ -49,20 +49,20 @@
63
64		IMPLEMENT_APP(wxLauncher);
65
66		const static wxCmdLineEntryDesc CmdLineOptions[] = {
67		- {wxCMD_LINE_SWITCH, NULL, _T("session-only"),
68		- _T("Do not remember the profile that is selected at exit")},
69		- {wxCMD_LINE_SWITCH, NULL, _T("add-profile"),
70		- _T("Add profile PROFILE from FILE. If PROFILE already exists ")
71		- _T("it will not be overwritten. Operator")},
72		- {wxCMD_LINE_SWITCH, NULL, _T("select-profile"),
73		- _T("Make PROFILE the that wxLauncher will use on next run. Operator")},
74		- {wxCMD_LINE_OPTION, NULL, _T("profile"),
75		- _T("The name of a profile to operate on. Operand PROFILE."),
76		+ {wxCMD_LINE_SWITCH, NULL, wxT_2("session-only"),
77		+ wxT_2("Do not remember the profile that is selected at exit")},
78		+ {wxCMD_LINE_SWITCH, NULL, wxT_2("add-profile"),
79		+ wxT_2("Add profile PROFILE from FILE. If PROFILE already exists ")
80		+ wxT_2("it will not be overwritten. Operator")},
81		+ {wxCMD_LINE_SWITCH, NULL, wxT_2("select-profile"),
82		+ wxT_2("Make PROFILE the that wxLauncher will use on next run. Operator")},
83		+ {wxCMD_LINE_OPTION, NULL, wxT_2("profile"),
84		+ wxT_2("The name of a profile to operate on. Operand PROFILE."),
85		wxCMD_LINE_VAL_STRING, 0},
86		- {wxCMD_LINE_OPTION, NULL, _T("file"),
87		- _T("The path to a file to operate on. Operand FILE."),
88		+ {wxCMD_LINE_OPTION, NULL, wxT_2("file"),
89		+ wxT_2("The path to a file to operate on. Operand FILE."),
90		wxCMD_LINE_VAL_STRING, 0},
91		{wxCMD_LINE_NONE},
92		};
93

+2

-2

debian/watch less more

0	0	# uscan(1)
1	1	version=3
2	2
3		http://code.google.com/p/wxlauncher/downloads/list?can=1 \
4		.*/wx[Ll]auncher-(?:source-)?([\d.]+)\.(?:tgz\|tbz2\|tar\.gz\|tar\.bz2\|tar\.xz)
	3	https://github.com/wxLauncher/wxlauncher/releases \
	4	.*/archive/release-(\d[-\d\.]+)\.tar\.gz