[Scummvm-cvs-logs] scummvm master -> 2c58867efe3e32b4627dddf2bc595905f4a37eb2
sev-
sev at scummvm.org
Sun Mar 27 23:52:38 CEST 2016
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
850b653d45 UPDATES: Added our public Sparkle key
f85595f0c2 UPDATES: Update Sparkle appcast with 1.8.0.
497bab6e43 UPDATES: Rename Sparkle appcast to common name
6c280ef527 UPDATES: Update Sparkle Appcast URL in the bundle plist
5441bb6116 BUILD: Add target for uploading Sparkle appcast
b02543b1a1 I18N: Fix wording in Russian localization
b68ed48987 I18N: Fix wording in Ukrainian localization
2c58867efe JANITORIAL: Remove trailing spaces
Commit: 850b653d4563b851feae22b0057c702baf5b6451
https://github.com/scummvm/scummvm/commit/850b653d4563b851feae22b0057c702baf5b6451
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-27T23:52:21+02:00
Commit Message:
UPDATES: Added our public Sparkle key
Changed paths:
A dists/macosx/dsa_pub.pem
diff --git a/dists/macosx/dsa_pub.pem b/dists/macosx/dsa_pub.pem
new file mode 100644
index 0000000..13eb862
--- /dev/null
+++ b/dists/macosx/dsa_pub.pem
@@ -0,0 +1,36 @@
+-----BEGIN PUBLIC KEY-----
+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
+pYCWvL3Wewrmz0Yc790=
+-----END PUBLIC KEY-----
Commit: f85595f0c2a25f7bb2780ec1e0bf3e4dd8549922
https://github.com/scummvm/scummvm/commit/f85595f0c2a25f7bb2780ec1e0bf3e4dd8549922
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-27T23:52:21+02:00
Commit Message:
UPDATES: Update Sparkle appcast with 1.8.0.
It will not work, of course since we were not distributing files
with our public key yet.
Changed paths:
dists/macosx/scummvm_osx_appcast.xml
diff --git a/dists/macosx/scummvm_osx_appcast.xml b/dists/macosx/scummvm_osx_appcast.xml
index 455b062..cf4cbcd 100644
--- a/dists/macosx/scummvm_osx_appcast.xml
+++ b/dists/macosx/scummvm_osx_appcast.xml
@@ -2,24 +2,30 @@
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel>
<title>ScummVM Changelog</title>
- <link>http://scummvm.org/scummvm_appcast.xml</link>
+ <link>https://scummvm.org/scummvm_appcast.xml</link>
<description>Most recent changes with links to updates.</description>
<language>en</language>
<item>
- <title>Version 1.2.1 (3 bugs fixed; 2 new features)</title>
+ <title>Version 1.8.0</title>
<sparkle:releaseNotesLink>
- http://sourceforge.net/projects/scummvm/files/scummvm/1.2.1/ReleaseNotes/view
+ https://scummvm.org/frs/scummvm/1.8.0/ReleaseNotes
</sparkle:releaseNotesLink>
- <pubDate>Sun, 19 Dec 2010 12:20:11 +0000</pubDate>
- <enclosure url="http://scummvm.org/ScummVM 1.2.1-Test.zip" sparkle:version="1.2.1" length="1472893" type="application/octet-stream" sparkle:dsaSignature="234818feCa1JyW30nbkBwainOzrN6EQuAh" />
+ <pubDate>Sat, 5 Mar 2016 20:16:00 +0000</pubDate>
+ <enclosure url="https://scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0-macosx.dmg"
+ sparkle:version="1.8.0" length="14085288" type="application/octet-stream"
+ sparkle:dsaSignature="MC0CFQDNy2yox7vklthHaZcMto8L4EuLwQIUY8cuevlTpLtuJ9nPOlrj4vo55lY=" />
+ <enclosure sparkle:os="windows"
+ url="https://scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0-win32.exe"
+ sparkle:version="1.8.0" length="9081062" type="application/octet-stream"
+ sparkle:dsaSignature="MC0CFQCaG7Oo+Nc2EWVmc7GjUBJLKRvt3QIUQcZTMe2FQhfvrrofX4HLTldDHyY=" />
</item>
<item>
- <title>Version 1.2.0</title>
+ <title>Version 1.7.0</title>
<sparkle:releaseNotesLink>
- http://sourceforge.net/projects/scummvm/files/scummvm/1.2.0/ReleaseNotes/view
+ https://scummvm.org/frs/scummvm/1.7.0/ReleaseNotes
</sparkle:releaseNotesLink>
- <pubDate>Fri, 15 Oct 2010 12:20:11 +0000</pubDate>
- <enclosure url="http://scummvm.org/ScummVM 1.2.0-Test.zip" sparkle:version="1.2.0" length="1472893" type="application/octet-stream" sparkle:dsaSignature="234818feCa1JyW30nbkBwainOzrN6EQuAh" />
+ <pubDate>Tue, 29 Jul 2014 07:58:00 +0000</pubDate>
+ <link>https://www.scummvm.org/frs/scummvm/1.7.0/</link>
</item>
</channel>
</rss>
Commit: 497bab6e43556317f3ce69ecd869042422eb3fe4
https://github.com/scummvm/scummvm/commit/497bab6e43556317f3ce69ecd869042422eb3fe4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-27T23:52:21+02:00
Commit Message:
UPDATES: Rename Sparkle appcast to common name
Changed paths:
A dists/macosx/scummvm_appcast.xml
R dists/macosx/scummvm_osx_appcast.xml
diff --git a/dists/macosx/scummvm_appcast.xml b/dists/macosx/scummvm_appcast.xml
new file mode 100644
index 0000000..cf4cbcd
--- /dev/null
+++ b/dists/macosx/scummvm_appcast.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <channel>
+ <title>ScummVM Changelog</title>
+ <link>https://scummvm.org/scummvm_appcast.xml</link>
+ <description>Most recent changes with links to updates.</description>
+ <language>en</language>
+ <item>
+ <title>Version 1.8.0</title>
+ <sparkle:releaseNotesLink>
+ https://scummvm.org/frs/scummvm/1.8.0/ReleaseNotes
+ </sparkle:releaseNotesLink>
+ <pubDate>Sat, 5 Mar 2016 20:16:00 +0000</pubDate>
+ <enclosure url="https://scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0-macosx.dmg"
+ sparkle:version="1.8.0" length="14085288" type="application/octet-stream"
+ sparkle:dsaSignature="MC0CFQDNy2yox7vklthHaZcMto8L4EuLwQIUY8cuevlTpLtuJ9nPOlrj4vo55lY=" />
+ <enclosure sparkle:os="windows"
+ url="https://scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0-win32.exe"
+ sparkle:version="1.8.0" length="9081062" type="application/octet-stream"
+ sparkle:dsaSignature="MC0CFQCaG7Oo+Nc2EWVmc7GjUBJLKRvt3QIUQcZTMe2FQhfvrrofX4HLTldDHyY=" />
+ </item>
+ <item>
+ <title>Version 1.7.0</title>
+ <sparkle:releaseNotesLink>
+ https://scummvm.org/frs/scummvm/1.7.0/ReleaseNotes
+ </sparkle:releaseNotesLink>
+ <pubDate>Tue, 29 Jul 2014 07:58:00 +0000</pubDate>
+ <link>https://www.scummvm.org/frs/scummvm/1.7.0/</link>
+ </item>
+ </channel>
+</rss>
diff --git a/dists/macosx/scummvm_osx_appcast.xml b/dists/macosx/scummvm_osx_appcast.xml
deleted file mode 100644
index cf4cbcd..0000000
--- a/dists/macosx/scummvm_osx_appcast.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <channel>
- <title>ScummVM Changelog</title>
- <link>https://scummvm.org/scummvm_appcast.xml</link>
- <description>Most recent changes with links to updates.</description>
- <language>en</language>
- <item>
- <title>Version 1.8.0</title>
- <sparkle:releaseNotesLink>
- https://scummvm.org/frs/scummvm/1.8.0/ReleaseNotes
- </sparkle:releaseNotesLink>
- <pubDate>Sat, 5 Mar 2016 20:16:00 +0000</pubDate>
- <enclosure url="https://scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0-macosx.dmg"
- sparkle:version="1.8.0" length="14085288" type="application/octet-stream"
- sparkle:dsaSignature="MC0CFQDNy2yox7vklthHaZcMto8L4EuLwQIUY8cuevlTpLtuJ9nPOlrj4vo55lY=" />
- <enclosure sparkle:os="windows"
- url="https://scummvm.org/frs/scummvm/1.8.0/scummvm-1.8.0-win32.exe"
- sparkle:version="1.8.0" length="9081062" type="application/octet-stream"
- sparkle:dsaSignature="MC0CFQCaG7Oo+Nc2EWVmc7GjUBJLKRvt3QIUQcZTMe2FQhfvrrofX4HLTldDHyY=" />
- </item>
- <item>
- <title>Version 1.7.0</title>
- <sparkle:releaseNotesLink>
- https://scummvm.org/frs/scummvm/1.7.0/ReleaseNotes
- </sparkle:releaseNotesLink>
- <pubDate>Tue, 29 Jul 2014 07:58:00 +0000</pubDate>
- <link>https://www.scummvm.org/frs/scummvm/1.7.0/</link>
- </item>
- </channel>
-</rss>
Commit: 6c280ef527d67c81ab5e676446b9316501214a0b
https://github.com/scummvm/scummvm/commit/6c280ef527d67c81ab5e676446b9316501214a0b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-27T23:52:21+02:00
Commit Message:
UPDATES: Update Sparkle Appcast URL in the bundle plist
Changed paths:
dists/macosx/Info.plist
dists/macosx/Info.plist.in
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 4013838..baa309c 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -53,7 +53,7 @@
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>SUFeedURL</key>
- <string>http://www.scummvm.org/appcasts/macosx/release.xml</string>
+ <string>https://scummvm.org/scummvm_appcast.xml</string>
<key>NSDockTilePlugIn</key>
<string>scummvm.docktileplugin</string>
<key>SUPublicDSAKeyFile</key>
diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in
index 7ba49f2..6393900 100644
--- a/dists/macosx/Info.plist.in
+++ b/dists/macosx/Info.plist.in
@@ -53,7 +53,7 @@
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>SUFeedURL</key>
- <string>http://www.scummvm.org/appcasts/macosx/release.xml</string>
+ <string>https://scummvm.org/scummvm_appcast.xml</string>
<key>NSDockTilePlugIn</key>
<string>scummvm.docktileplugin</string>
<key>SUPublicDSAKeyFile</key>
Commit: 5441bb61162cf911cdbb2b3e3738719952b171f9
https://github.com/scummvm/scummvm/commit/5441bb61162cf911cdbb2b3e3738719952b171f9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-27T23:52:21+02:00
Commit Message:
BUILD: Add target for uploading Sparkle appcast
Changed paths:
ports.mk
diff --git a/ports.mk b/ports.mk
index 03092e2..3cd3cd2 100644
--- a/ports.mk
+++ b/ports.mk
@@ -406,6 +406,9 @@ osxsnap: bundle
ScummVM-snapshot.dmg
rm -rf ScummVM-snapshot
+publish-appcast:
+ scp dists/macosx/scummvm_appcast.xml www.scummvm.org:/var/www/html/
+
#
# Windows specific
#
Commit: b02543b1a1f23745fa376f8b00716068122ca6b0
https://github.com/scummvm/scummvm/commit/b02543b1a1f23745fa376f8b00716068122ca6b0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-27T23:52:21+02:00
Commit Message:
I18N: Fix wording in Russian localization
Changed paths:
po/ru_RU.po
diff --git a/po/ru_RU.po b/po/ru_RU.po
index ba91013..a227eff 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -2309,7 +2309,7 @@ msgstr ""
#: backends/updates/macosx/macosx-updates.mm:67
msgid "Check for Updates..."
-msgstr "¿àÞÒÕàïî ÞÑÝÞÒÛÕÝØï..."
+msgstr "¿àÞÒÕàØâì ÞÑÝÞÒÛÕÝØï..."
#: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70
#: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47
Commit: b68ed4898757fadc39d9f72f1271141ed4d6ac2a
https://github.com/scummvm/scummvm/commit/b68ed4898757fadc39d9f72f1271141ed4d6ac2a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-27T23:52:21+02:00
Commit Message:
I18N: Fix wording in Ukrainian localization
Changed paths:
po/uk_UA.po
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 5ab87a4..9c21ec7 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -2306,7 +2306,7 @@ msgstr ""
#: backends/updates/macosx/macosx-updates.mm:67
msgid "Check for Updates..."
-msgstr "¿ÕàÕÒöàïî ÞÝÞÒÛÕÝÝï..."
+msgstr "¿ÕàÕÒöàØâØ ÞÝÞÒÛÕÝÝï..."
#: engines/agi/detection.cpp:147 engines/cine/detection.cpp:70
#: engines/drascula/detection.cpp:302 engines/dreamweb/detection.cpp:47
Commit: 2c58867efe3e32b4627dddf2bc595905f4a37eb2
https://github.com/scummvm/scummvm/commit/2c58867efe3e32b4627dddf2bc595905f4a37eb2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-27T23:52:21+02:00
Commit Message:
JANITORIAL: Remove trailing spaces
Changed paths:
ports.mk
diff --git a/ports.mk b/ports.mk
index 3cd3cd2..a675c52 100644
--- a/ports.mk
+++ b/ports.mk
@@ -67,10 +67,10 @@ ScummVMDockTilePlugin32: ScummVMDockTilePlugin32.o
ScummVMDockTilePlugin64.o:
$(CXX) -mmacosx-version-min=10.6 -arch x86_64 -O2 -c $(srcdir)/backends/taskbar/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin64.o
-
+
ScummVMDockTilePlugin64: ScummVMDockTilePlugin64.o
$(CXX) -mmacosx-version-min=10.6 -arch x86_64 -bundle -framework Foundation -framework AppKit -fobjc-link-runtime ScummVMDockTilePlugin64.o -o ScummVMDockTilePlugin64
-
+
ScummVMDockTilePlugin: ScummVMDockTilePlugin32 ScummVMDockTilePlugin64
lipo -create ScummVMDockTilePlugin32 ScummVMDockTilePlugin64 -output ScummVMDockTilePlugin
@@ -80,7 +80,7 @@ scummvm.docktileplugin: ScummVMDockTilePlugin
mkdir -p scummvm.docktileplugin/Contents/MacOS
cp ScummVMDockTilePlugIn scummvm.docktileplugin/Contents/MacOS/
chmod 644 scummvm.docktileplugin/Contents/MacOS/ScummVMDockTilePlugIn
-
+
endif
bundle_name = ScummVM.app
@@ -487,12 +487,12 @@ CUR_BRANCH := $(shell cd $(srcdir); git describe --all |cut -d '-' -f 4-)
ideprojects: devtools/create_project
ifeq ($(VER_DIRTY), -dirty)
- $(error You have uncommitted changes)
-endif
+ $(error You have uncommitted changes)
+endif
ifeq "$(CUR_BRANCH)" "heads/master"
- $(error You cannot do it on master)
+ $(error You cannot do it on master)
else ifeq "$(CUR_BRANCH)" ""
- $(error You must be on a release branch)
+ $(error You must be on a release branch)
endif
@echo Creating Code::Blocks project files...
@cd $(srcdir)/dists/codeblocks && ../../devtools/create_project/create_project ../.. --codeblocks >/dev/null && git add -f engines/plugins_table.h *.workspace *.cbp
More information about the Scummvm-git-logs
mailing list