From b66614bf449b705a9e29b9378af6a62473370978 Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@nurfuerspam.de>
Date: Mon, 29 May 2017 19:45:30 +0200
Subject: [PATCH] player.efis.data.*: Fix builds

---
 metadata/player.efis.data.eur.rus.txt | 12 ++++--------
 metadata/player.efis.data.txt         |  8 +-------
 metadata/player.efis.data.usa.can.txt |  9 ++-------
 metadata/player.efis.data.zar.aus.txt | 15 +++++----------
 4 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/metadata/player.efis.data.eur.rus.txt b/metadata/player.efis.data.eur.rus.txt
index a3ded91c39..9f7d25c5fd 100644
--- a/metadata/player.efis.data.eur.rus.txt
+++ b/metadata/player.efis.data.eur.rus.txt
@@ -21,16 +21,12 @@ The synthetic vision terrain (DEM) data pack for use with Kwik EFIS.
 Repo Type:git
 Repo:https://github.com/ninelima/kwikEFIS
 
-Build:1.1,2
-    disable=requires same key as player.efis.pfd
-    commit=9b06f501f6ac193d92740bb98651dbcd2300e2c6
+Build:1.0,1
+    disable=fdroid/admin#31
+    commit=5741d28a68f6bd5acfb3ec799e27c825824d1baa
     subdir=data.eur.rus
     gradle=yes
-    prebuild=sed -i -e '/applicationId/s/player.efis.data/player.efis.data.eur.rus/' build.gradle
-
-Maintainer Notes:
-PR for packageId change pending.
-.
+    prebuild=sed -i -e 's@//applicationId@applicationId@g' build.gradle
 
 Auto Update Mode:None
 Update Check Mode:Tags ^PROD
diff --git a/metadata/player.efis.data.txt b/metadata/player.efis.data.txt
index a6aac9cb38..076c478d5c 100644
--- a/metadata/player.efis.data.txt
+++ b/metadata/player.efis.data.txt
@@ -21,14 +21,8 @@ The synthetic vision terrain (DEM) data pack for use with Kwik EFIS.
 Repo Type:git
 Repo:https://github.com/ninelima/kwikEFIS
 
-Build:1.0,1
-    disable=requires same key as player.efis.pfd
-    commit=5d02ed4b81ebe8b52c0c1ea9b5de03fd6dadbf54
-    subdir=data
-    gradle=yes
-
 Build:1.1,2
-    disable=requires same key as player.efis.pfd
+    disable=fdroid/admin#31
     commit=PROD_3_1
     subdir=data
     gradle=yes
diff --git a/metadata/player.efis.data.usa.can.txt b/metadata/player.efis.data.usa.can.txt
index 6b6dc05404..c57ae41e82 100644
--- a/metadata/player.efis.data.usa.can.txt
+++ b/metadata/player.efis.data.usa.can.txt
@@ -22,15 +22,10 @@ Repo Type:git
 Repo:https://github.com/ninelima/kwikEFIS
 
 Build:1.1,2
-    disable=requires same key as player.efis.pfd
-    commit=9b06f501f6ac193d92740bb98651dbcd2300e2c6
+    disable=fdroid/admin#31
+    commit=5741d28a68f6bd5acfb3ec799e27c825824d1baa
     subdir=data.usa.can
     gradle=yes
-    prebuild=sed -i -e '/applicationId/s/player.efis.data/player.efis.data.usa.can/' build.gradle
-
-Maintainer Notes:
-PR for packageId change pending.
-.
 
 Auto Update Mode:None
 Update Check Mode:Tags ^PROD
diff --git a/metadata/player.efis.data.zar.aus.txt b/metadata/player.efis.data.zar.aus.txt
index ce10f60fdc..cb48f862e8 100644
--- a/metadata/player.efis.data.zar.aus.txt
+++ b/metadata/player.efis.data.zar.aus.txt
@@ -21,18 +21,13 @@ The synthetic vision terrain (DEM) data pack for use with Kwik EFIS.
 Repo Type:git
 Repo:https://github.com/ninelima/kwikEFIS
 
-Build:1.1,2
-    disable=requires same key as player.efis.pfd
-    commit=9b06f501f6ac193d92740bb98651dbcd2300e2c6
+Build:1.2,3
+    disable=fdroid/admin#31
+    commit=5741d28a68f6bd5acfb3ec799e27c825824d1baa
     subdir=data.zar.aus
     gradle=yes
-    prebuild=sed -i -e '/applicationId/s/player.efis.data/player.efis.data.zar.aus/' build.gradle
-
-Maintainer Notes:
-PR for packageId change pending.
-.
 
 Auto Update Mode:None
 Update Check Mode:Tags ^PROD
-Current Version:1.1
-Current Version Code:2
+Current Version:1.2
+Current Version Code:3