Merge branch 'nononsensenotes' into 'master'

Update NoNonsenseNotes to 5.5.5

This updates the app to the newest version which fixes a couple of crash reports.

I am uncertain about the required gradle version in F-Droid and could not find
any information about it in the manual, so I removed the *sed*-line regarding
the gradle version.

See merge request !821

metadata/com.nononsenseapps.notepad.txt

@@ -1,5 +1,5 @@
 Categories:Office
-License:Apache2
+License:GPLv3+
 Web Site:https://github.com/spacecowboy/NotePad
 Source Code:http://www.nononsenseapps.com
 #Source Code:https://github.com/spacecowboy/NotePad/blob/HEAD/README.md
@@ -101,6 +101,14 @@ Build:5.5.3,55300
         sed -i -e 's/gradle:0.14.0/gradle:0.12.0/g' build.gradle ../build.gradle && \
         cp -fR $$Orgparser$$/src/main/java/org src/free/java/
 
+Build:5.5.5,55500
+    commit=5.5.5
+    subdir=app
+    patch=remove_play_configs-55500.patch
+    gradle=free
+    rm=app/libs/*.jar
+    prebuild=rm -rf *.zip *.png *.7z *.psd src/play src/playBeta src/androidTest
+
 
 Maintainer Notes:
 * INFO: replaced dashclock-api-r1.jar with dashclock-api:2.0.0

metadata/com.nononsenseapps.notepad/remove_play_configs-55500.patch

@@ -0,0 +1,81 @@
+From 911370abfd918c98d5fad958e025ba812f39b2ec Mon Sep 17 00:00:00 2001
+From: Jonas Kalderstam <jonas@kalderstam.se>
+Date: Wed, 29 Oct 2014 15:34:42 +0100
+Subject: [PATCH] Remove play configs for fdroid
+
+Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>
+---
+ app/build.gradle | 45 ---------------------------------------------
+ 1 file changed, 45 deletions(-)
+
+diff --git a/app/build.gradle b/app/build.gradle
+index f803a79..8b1b143 100644
+--- a/app/build.gradle
++++ b/app/build.gradle
+@@ -78,27 +78,6 @@ android {
+ 
+     productFlavors {
+         free {}
+-      play {
+-          // If Non-Free libraries are to be used
+-          buildConfigField "boolean", "NONFREE", "true"
+-      }
+-      playBeta {
+-        // Beta runs at +1
+-        versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild * 10 + 1
+-
+-        buildConfigField "boolean", "DROPBOX_ENABLED", "true"
+-        // If Non-Free libraries are to be used
+-        buildConfigField "boolean", "NONFREE", "true"
+-      }
+-    }
+-
+-    sourceSets {
+-        playBeta {
+-            // Include play sources
+-            java.srcDirs = ['src/play/java']
+-            res.srcDirs = ['src/play/res', 'src/playBeta/res']
+-            manifest.srcFile 'src/play/AndroidManifest.xml'
+-        }
+     }
+ 
+     if (project.hasProperty('STORE_FILE')) {
+@@ -129,20 +108,6 @@ apt {
+     }
+ }
+ 
+-// Dropbox
+-task nativeLibsToJar(type: Zip) {
+-    destinationDir file("$buildDir/native-libs")
+-    baseName 'native-libs'
+-    extension 'jar'
+-    from fileTree(dir: 'src/play/libs', include: '**/*.so')
+-    into 'lib/'
+-}
+-
+-// If non-free, depend on dropbox
+-tasks.withType(JavaCompile) {
+-    compileTask -> if (compileTask.toString().contains("Play")) compileTask.dependsOn(nativeLibsToJar)
+-}
+-
+ dependencies {
+     //compile fileTree(dir: 'libs', include: '*.jar')
+     compile 'com.android.support:support-v4:19.0.1'
+@@ -161,14 +126,4 @@ dependencies {
+     // annotations
+     apt "org.androidannotations:androidannotations:$AAVersion"
+     compile "org.androidannotations:androidannotations-api:$AAVersion"
+-    // Dropbox and non-free stuff
+-    playCompile fileTree(dir: 'src/play/libs', include: '*.jar')
+-    playBetaCompile fileTree(dir: 'src/play/libs', include: '*.jar')
+-    playCompile fileTree(dir: "$buildDir/native-libs", include: "*.jar")
+-    playCompile 'com.google.android.gms:play-services:5.0.89'
+-    playBetaCompile fileTree(dir: "$buildDir/native-libs", include: "*.jar")
+-    playBetaCompile 'com.google.android.gms:play-services:5.0.89'
+-    // Tests
+-    androidTestCompile 'com.squareup.spoon:spoon-client:1.1.1'
+-
+ }
+-- 
+2.1.4
+