From 1b6f41f11f1b948c7817a927ff3d790c7adee3a6 Mon Sep 17 00:00:00 2001
From: Bill Farmer <williamjfarmer@yahoo.co.uk>
Date: Thu, 12 Jun 2014 16:07:36 +0100
Subject: [PATCH] Update metadata/org.billthefarmer.accordion.txt,
 metadata/org.billthefarmer.melodeon.txt and
 metadata/org.billthefarmer.siggen.txt

---
 metadata/org.billthefarmer.accordion.txt | 28 +++++++++++++++------
 metadata/org.billthefarmer.melodeon.txt  | 32 +++++++++++++++++-------
 metadata/org.billthefarmer.siggen.txt    |  2 +-
 3 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/metadata/org.billthefarmer.accordion.txt b/metadata/org.billthefarmer.accordion.txt
index c7e5113e5f..c63109d9b8 100644
--- a/metadata/org.billthefarmer.accordion.txt
+++ b/metadata/org.billthefarmer.accordion.txt
@@ -24,16 +24,30 @@ Repo:https://github.com/billthefarmer/accordion
 Build:1.01,101
     commit=v1.01
     extlibs=arch-arm/libsonivox.so
+    scandelete=libs/armeabi/libmidi.so
     scanignore=libs/libsonivox.so
-    build=mkdir -p ndk-r8e/toolchains && \
-        find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs -0 cp -r -t ndk-r8e/ && \
-        cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r8e/toolchains/ && \
-        mv libs/libsonivox.so ndk-r8e/platforms/android-14/arch-arm/usr/lib/ && \
-        ./ndk-r8e/ndk-build && \
-        rm -rf ndk-r8e/
+    build=mkdir -p ndk-r9d/toolchains && \
+        find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs -0 cp -r -t ndk-r9d/ && \
+        cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r9d/toolchains/ && \
+        mv libs/libsonivox.so ndk-r9d/platforms/android-17/arch-arm/usr/lib/ && \
+        ./ndk-r9d/ndk-build && \
+        rm -rf ndk-r9d/
     buildjni=no
 
-Auto Update Mode:None
+Build:1.02,102
+    commit=v1.02
+    extlibs=arch-arm/libsonivox.so
+    scandelete=libs/armeabi/libmidi.so
+    scanignore=libs/libsonivox.so
+    build=mkdir -p ndk-r9d/toolchains && \
+        find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs -0 cp -r -t ndk-r9d/ && \
+        cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r9d/toolchains/ && \
+        mv libs/libsonivox.so ndk-r9d/platforms/android-17/arch-arm/usr/lib/ && \
+        ./ndk-r9d/ndk-build && \
+        rm -rf ndk-r9d/
+    buildjni=no
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.02
 Current Version Code:102
diff --git a/metadata/org.billthefarmer.melodeon.txt b/metadata/org.billthefarmer.melodeon.txt
index 9f53a819a3..cdd132e6f3 100644
--- a/metadata/org.billthefarmer.melodeon.txt
+++ b/metadata/org.billthefarmer.melodeon.txt
@@ -7,8 +7,8 @@ Issue Tracker:https://github.com/billthefarmer/melodeon/issues
 Auto Name:Melodeon
 Summary:Melodeon emulator for tablets
 Description:
-Emulates a one row melodeon or a one and a half rown organetto.
-There is a choice of midi intruments and keys.
+Emulates a one row melodeon or a one and a half row organetto.
+There is a choice of midi instruments and keys.
 
 * Keys: Eb, Bb, F, C, G, D, A
 * Instruments: Standard midi set, defaults to accordion
@@ -24,16 +24,30 @@ Repo:https://github.com/billthefarmer/melodeon
 Build:1.0,1
     commit=v1.0
     extlibs=arch-arm/libsonivox.so
+    scandelete=libs/armeabi/libmidi.so
     scanignore=libs/libsonivox.so
-    build=mkdir -p ndk-r8e/toolchains/ && \
-        find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs -0 cp -r -t ndk-r8e/ && \
-        cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r8e/toolchains/ && \
-        mv libs/libsonivox.so ndk-r8e/platforms/android-14/arch-arm/usr/lib/ && \
-        ./ndk-r8e/ndk-build && \
-        rm -rf ndk-r8e/
+    build=mkdir -p ndk-r9d/toolchains/ && \
+        find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs -0 cp -r -t ndk-r9d/ && \
+        cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r9d/toolchains/ && \
+        mv libs/libsonivox.so ndk-r9d/platforms/android-17/arch-arm/usr/lib/ && \
+        ./ndk-r9d/ndk-build && \
+        rm -rf ndk-r9d/
     buildjni=no
 
-Auto Update Mode:None
+Build:1.01,101
+    commit=v1.01
+    extlibs=arch-arm/libsonivox.so
+    scandelete=libs/armeabi-v7a/libmidi.so,libs/armeabi/libmidi.so,libs/mips/libmidi.so,libs/x86/libmidi.so
+    scanignore=libs/libsonivox.so
+    build=mkdir -p ndk-r9d/toolchains/ && \
+        find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs -0 cp -r -t ndk-r9d/ && \
+        cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r9d/toolchains/ && \
+        mv libs/libsonivox.so ndk-r9d/platforms/android-17/arch-arm/usr/lib/ && \
+        ./ndk-r9d/ndk-build && \
+        rm -rf ndk-r9d/
+    buildjni=no
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.01
 Current Version Code:101
diff --git a/metadata/org.billthefarmer.siggen.txt b/metadata/org.billthefarmer.siggen.txt
index 0fffbc9228..41d578bfd3 100644
--- a/metadata/org.billthefarmer.siggen.txt
+++ b/metadata/org.billthefarmer.siggen.txt
@@ -27,7 +27,7 @@ Build:1.0,1
 Build:1.01,101
     commit=v1.01
 
-Auto Update Mode:Version %v
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.01
 Current Version Code:101