From 92b279fe706e1a36cc4b9180cae3509a25a82767 Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@nurfuerspam.de>
Date: Sat, 21 Mar 2015 15:07:11 +0100
Subject: [PATCH] =?UTF-8?q?=C2=B5g=20UnifiedNlp:=20Unify=20and=20set=20AUM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 metadata/com.google.android.gms.txt      | 19 ++++++++-----------
 metadata/com.google.android.location.txt |  8 ++------
 metadata/org.microg.nlp.txt              |  7 +------
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/metadata/com.google.android.gms.txt b/metadata/com.google.android.gms.txt
index 386afbc6fb..618f13ae60 100644
--- a/metadata/com.google.android.gms.txt
+++ b/metadata/com.google.android.gms.txt
@@ -4,7 +4,7 @@ Web Site:https://github.com/microg
 Source Code:https://github.com/microg/android_packages_apps_UnifiedNlp
 Issue Tracker:https://github.com/microg/android_packages_apps_UnifiedNlp//issues
 
-Name:µg UnifiedNlp (for GAPPS-free devices)
+Name:µg UnifiedNlp for GAPPS-free devices
 Auto Name:µg UnifiedNlp
 Summary:Location provider middleware (UnifiedNlp)
 Description:
@@ -46,25 +46,22 @@ Build:1.1.3,1103
 
 Build:1.2.0,1200
     commit=v1.2.0
-    gradle=NetworkLocation
     submodules=yes
+    gradle=NetworkLocation
 
 Build:1.2.2,1202
     commit=v1.2.2
-    gradle=NetworkLocation
     submodules=yes
+    gradle=NetworkLocation
 
 Build:1.3.0,1300
     commit=v1.3.0
-    gradle=NetworkLocation
     submodules=yes
+    gradle=NetworkLocation
 
-Maintainer Notes:
-* UCM and AUM fail, because the app uses org.microg.nlp as package id
-  in AM.xml and changes this on buildtime. This cannot be fixed in init=.
-* Auto Update Mode:Version v%v
-* Update Check Mode:Tags
-.
-
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Update Check Name:org.microg.nlp
 Current Version:1.3.0
 Current Version Code:1300
+
diff --git a/metadata/com.google.android.location.txt b/metadata/com.google.android.location.txt
index 6fe5be67c8..5c1ac60add 100644
--- a/metadata/com.google.android.location.txt
+++ b/metadata/com.google.android.location.txt
@@ -4,7 +4,7 @@ Web Site:https://github.com/microg
 Source Code:https://github.com/microg/android_packages_apps_UnifiedNlp
 Issue Tracker:https://github.com/microg/android_packages_apps_UnifiedNlp//issues
 
-Name:µg UnifiedNlp (Legacy build for GAPPS-free devices)
+Name:µg UnifiedNlp for GAPPS-free devices (legacy)
 Auto Name:µg UnifiedNlp
 Summary:Location provider middleware (UnifiedNlp)
 Description:
@@ -35,12 +35,8 @@ Build:1.3.0,1300
     submodules=yes
     gradle=LegacyNetworkLocation
 
-Maintainer Notes:
-If UCM and AUM fail, this is most likely due to the app using multiple package
-ids. See the com.google.android.gms metadata for further information.
-.
-
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
+Update Check Name:org.microg.nlp
 Current Version:1.3.0
 Current Version Code:1300
diff --git a/metadata/org.microg.nlp.txt b/metadata/org.microg.nlp.txt
index 52a78e5f88..372f25668c 100644
--- a/metadata/org.microg.nlp.txt
+++ b/metadata/org.microg.nlp.txt
@@ -4,7 +4,7 @@ Web Site:https://github.com/microg
 Source Code:https://github.com/microg/android_packages_apps_UnifiedNlp
 Issue Tracker:https://github.com/microg/android_packages_apps_UnifiedNlp//issues
 
-Name:µg UnifiedNlp (for GAPPS devices)
+Name:µg UnifiedNlp for devices with GAPPS
 Auto Name:µg UnifiedNlp
 Summary:Location provider middleware (UnifiedNlp)
 Description:
@@ -42,11 +42,6 @@ Build:1.3.0,1300
     submodules=yes
     gradle=UnifiedNlp
 
-Maintainer Notes:
-If UCM and AUM fail, this is most likely due to the app using multiple package
-ids. See the com.google.android.gms metadata for further information.
-.
-
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.3.0