Merge branch 'master' into new-swap--updated-downloader

Fixed multiple conflicts to do with the repo updater moving to
broadcasts from the previous progress listeners.

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "extern/Support"]
-	path = extern/Support
-	url = https://android.googlesource.com/platform/frameworks/support
-	ignore = dirty

CHANGELOG.md

@@ -1,6 +1,9 @@
-### Upcoming release
+### 0.95 (2015-08-04)
 
-* Adapt UI to use Material Design
+* Start porting UI to Material Design, including a new launcher icon
+
+* Add support for app changelog links, which will appear for apps that have
+  them once the repositories have been updated again
 
 * Redesign the App Details view with larger icons, expandable description and
   links with icons
@@ -11,11 +14,16 @@
 * Remove the root installer, since the system installer is safer, more stable
   and now easy to set up with root privileges
 
+* Speed up and simplify repo update process by streaming the data out of the
+  jar file directly
+
 * Can now manually add swap repo via "Repositories" screen
 
 * Using NFC during swap now initiates a proper swap, rather than redirecting to
   the "Repositories" screen
 
+* Drop ant support to greatly simplify the build process and its maintenance
+
 ### 0.92 (2015-06-08)
 
 * Make swap only in portrait mode to prevent crashes and issues where UI elements are obscured

F-Droid/AndroidManifest.xml

@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.fdroid.fdroid"
     android:installLocation="auto"
-    android:versionCode="940"
-    android:versionName="0.94-test"
+    android:versionCode="95050"
+    android:versionName="0.95"
     >
 
     <uses-sdk
@@ -62,7 +62,7 @@
         android:label="@string/app_name"
         android:description="@string/app_description"
         android:allowBackup="true"
-        android:theme="@style/AppThemeDark"
+        android:theme="@style/AppThemeLight"
         android:supportsRtl="true"
         >
 

F-Droid/build.gradle

@@ -109,8 +109,7 @@ task binaryDeps(type: Copy, dependsOn: ':F-Droid:prepareReleaseDependencies') {
         include 'support-v4-preferencefragment/build/outputs/aar/support-v4-preferencefragment-release.aar',
                 'nanohttpd/core/build/libs/nanohttpd-2.1.0.jar',
                 'zipsigner/build/libs/zipsigner.jar',
-                'jmdns/build/libs/jmdns.jar',
-                'Support/v4/build/libs/support-v4.jar'
+                'jmdns/build/libs/jmdns.jar'
     }
 
     into 'libs/binaryDeps'
@@ -174,6 +173,9 @@ android {
     lintOptions {
         checkReleaseBuilds false
         abortOnError false
+
+        // Our translations are crowd-sourced
+        disable 'MissingTranslation'
     }
 
     // Enable all Android lint warnings

F-Droid/libs/README.md

@@ -1,8 +1,10 @@
 # Licenses
 
-To see which license any one of these libraries is under, consult the extern/ directory.
-If you have checked out the source for all dependencies (`git submodule update --init` from the root directory),
-then you should be able to find the relevant LICENSE file for each, or else you can consult upstream.
+To see which license any one of these libraries is under, consult the extern/
+directory. If you have checked out the source for all dependencies (`git
+submodule update --init` from the root directory if there are any submodules),
+then you should be able to find the relevant LICENSE file for each, or else
+you can consult upstream.
 
 
 # Building libraries from source

F-Droid/lint.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-    <!-- Remove severity="ignore" to see the missing translations -->
-    <issue id="MissingTranslation" severity="ignore" />
-    <issue id="TrulyRandom" severity="ignore" />
-    <issue id="UnusedResources" severity="ignore">
-        <ignore path="res/values/default_repo.xml" />
-    </issue>
-</lint>