From 19c48901f420379b7e3c85d9c4c2b06279a5362e Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Fri, 2 Nov 2012 10:32:05 +0000 Subject: [PATCH 1/4] Typo fix --- wp-fdroid/wp-fdroid.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php index 8a4dcedf..2fed1e1c 100644 --- a/wp-fdroid/wp-fdroid.php +++ b/wp-fdroid/wp-fdroid.php @@ -294,7 +294,7 @@ class FDroid $out.="

NOTE: Although APK downloads are available below to give "; $out.="you the choice, you should be aware that by installing that way you "; - $out.="will not receieve update notifications, and it's a less secure way "; + $out.="will not receive update notifications, and it's a less secure way "; $out.="to download, especially if you are not currently using HTTPS. "; $out.="We recommend that you install the F-Droid client and use that.

"; From 859ef52140f61aa2e62830b378c3d36778fee4fd Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Sat, 1 Dec 2012 07:17:59 +0000 Subject: [PATCH 2/4] Don't stall update for 'bad' wiki page names --- fdroidserver/update.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 3d9e6162..81e43c5b 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -168,8 +168,11 @@ def update_wiki(apps, apks, verbose=False): print "Checking " + pagename if not pagename in existingpages: print "Creating page " + pagename - newpage = site.Pages[pagename] - newpage.save(text, summary='Auto-created') + try: + newpage = site.Pages[pagename] + newpage.save(text, summary='Auto-created') + except: + print "...FAILED to create page" From 5afdbca5e368b1edff691a113e4c651ff4c93917 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Sat, 1 Dec 2012 07:20:47 +0000 Subject: [PATCH 3/4] Add zip to buildserver packages --- buildserver/cookbooks/fdroidbuild-general/recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb index be3679e0..3eeea142 100644 --- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb +++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb @@ -1,5 +1,5 @@ -%w{ant ant-contrib autoconf bison libtool libssl libssl-dev maven javacc python git-core mercurial subversion bzr git-svn make perlmagick}.each do |pkg| +%w{ant ant-contrib autoconf bison libtool libssl libssl-dev maven javacc python git-core mercurial subversion bzr git-svn make perlmagick zip}.each do |pkg| package pkg do action :install end From ea67ae16734a75efceaa84abedd5d08a839de62d Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 13 Dec 2012 09:19:42 +0000 Subject: [PATCH 4/4] Correct libssl package name --- buildserver/cookbooks/fdroidbuild-general/recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb index 3eeea142..07a4ca52 100644 --- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb +++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb @@ -1,5 +1,5 @@ -%w{ant ant-contrib autoconf bison libtool libssl libssl-dev maven javacc python git-core mercurial subversion bzr git-svn make perlmagick zip}.each do |pkg| +%w{ant ant-contrib autoconf bison libtool libssl1.0.0 libssl-dev maven javacc python git-core mercurial subversion bzr git-svn make perlmagick zip}.each do |pkg| package pkg do action :install end