Merge branch 'master' into logging

diff --git a/README b/README
index ee354e8d9c0f2b2989ec20d41fbb03a643a86121..4a9ac0755259fa294a4b1f9973de713617e9c4a9 100644 (file)
--- a/README
+++ b/README
@@ -9,4 +9,4 @@ assist in creating, testing and submitting metadata to the main repository.
 
 For documentation, please see the docs directory.
 
-Alternatively, visit http://f-droid.org/manual/
+Alternatively, visit https://f-droid.org/manual/

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index d72f67f106a05a9eadf61e5241b4db308b32d91b..6f9e6069b4d937c5f983e80bc4f97dc6f3318306 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -97,7 +97,7 @@ def update_wiki(apps, apks):
             wikidata += "This app provides: %s" % ', '.join(app['Summary'].split(','))
 
         wikidata += app['Summary']
-        wikidata += " - [http://f-droid.org/repository/browse/?fdid=" + app['id'] + " view in repository]\n\n"
+        wikidata += " - [https://f-droid.org/repository/browse/?fdid=" + app['id'] + " view in repository]\n\n"
 
         wikidata += "=Description=\n"
         wikidata += metadata.description_wiki(app['Description']) + "\n"

diff --git a/makebuildserver b/makebuildserver
index 165d31a844baef6fbc50f3999dc3cb181d1c71bd..d4fde838f4a568419adc32bed86fabb38d87a7f3 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -61,7 +61,7 @@ if not os.path.exists(cachedir):
     os.mkdir(cachedir)
 cachefiles = [
     ('android-sdk_r22.3-linux.tgz',
-     'http://dl.google.com/android/android-sdk_r22.3-linux.tgz',
+     'https://dl.google.com/android/android-sdk_r22.3-linux.tgz',
      '4077575c98075480e0156c10e48a1521e31c7952768271a206870e6813057f4f'),
     ('gradle-1.4-bin.zip',
      'http://services.gradle.org/distributions/gradle-1.4-bin.zip',
@@ -82,24 +82,24 @@ cachefiles = [
      'http://services.gradle.org/distributions/gradle-1.10-bin.zip',
      '6e6db4fc595f27ceda059d23693b6f6848583950606112b37dfd0e97a0a0a4fe'),
     ('Kivy-1.7.2.tar.gz',
-     'http://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
+     'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1')
     ]
 if config['arch64']:
     cachefiles.extend([
     ('android-ndk-r9b-linux-x86_64.tar.bz2',
-     'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
+     'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
      '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
     ('android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
-     'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
+     'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
      'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')])
 else:
     cachefiles.extend([
     ('android-ndk-r9b-linux-x86.tar.bz2',
-     'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2',
+     'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2',
      '748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'),
     ('android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
-     'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
+     'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
      '606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f')])
 wanted = []
 

diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php
index b4903d43b2ee911542f8dd2ba02c60e62e4fd7a9..0585750e82966cc45872af7812d3aa4018173b07 100644 (file)
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: WP FDroid
-Plugin URI: http://f-droid.org/repository
+Plugin URI: https://f-droid.org/repository
 Description: An FDroid repository browser
 Author: Ciaran Gultnieks
 Version: 0.01