From 20b39e6c15b712bd8e7dd0b6b0f3b96d651317ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 14 Jan 2016 23:36:30 +0100
Subject: [PATCH] Start removing comments from metadata
We'll soon be switching fdroiddata to YAML. Since comments in YAML are
throwaway, parsers (including the one in python) discard them.
So before doing the switch, those comments worth keeping will be moved
to Maintainer Notes. This is the first of that series of commits.
---
metadata/am.ed.exportcontacts.txt | 2 --
metadata/am.ed.importcontacts.txt | 2 --
metadata/anupam.acrylic.txt | 1 -
metadata/apps.droidnotify.txt | 6 ++++--
metadata/at.bitfire.cadroid.txt | 5 ++++-
metadata/at.tomtasche.reader.txt | 1 -
metadata/caldwell.ben.trolly.txt | 5 ++++-
metadata/com.MarcosDiez.shareviahttp.txt | 2 --
metadata/com.adstrosoftware.launchappops.txt | 5 -----
metadata/com.alfray.timeriffic.txt | 5 ++++-
metadata/com.andrew.apollo.txt | 12 ------------
metadata/com.android.inputmethod.norwegian.txt | 5 -----
metadata/com.android.keepass.txt | 5 ++---
13 files changed, 18 insertions(+), 38 deletions(-)
diff --git a/metadata/am.ed.exportcontacts.txt b/metadata/am.ed.exportcontacts.txt
index e5a3ec08a2..3bf6c349f5 100644
--- a/metadata/am.ed.exportcontacts.txt
+++ b/metadata/am.ed.exportcontacts.txt
@@ -19,8 +19,6 @@ contacts file is exported to your SD card directly from the phones contact list.
Repo Type:bzr
Repo:http://bzr.ed.am/android/export-contacts
-# Build Version:1.1,2,27
-# Change package id
Build:1.0.3,10003
commit=1.0.3
diff --git a/metadata/am.ed.importcontacts.txt b/metadata/am.ed.importcontacts.txt
index 9f810f8b7b..b9bdaf0476 100644
--- a/metadata/am.ed.importcontacts.txt
+++ b/metadata/am.ed.importcontacts.txt
@@ -20,8 +20,6 @@ contact list.
Repo Type:bzr
Repo:http://bzr.ed.am/android/import-contacts
-# Build Version:1.1,2,27
-# Change package id
Build:1.3.1,10301
commit=1.3.1
diff --git a/metadata/anupam.acrylic.txt b/metadata/anupam.acrylic.txt
index b348c2de12..89620ac98f 100644
--- a/metadata/anupam.acrylic.txt
+++ b/metadata/anupam.acrylic.txt
@@ -22,7 +22,6 @@ Build:1.2.0,3
commit=e534db825b557ac523297599139a0616a4ce2545
subdir=Acrylic_Paint
-# Forked by Anupam-community
Build:1.2.4,4
commit=ec4b0e82deda585372e693bb10e1dc25a01508d6
diff --git a/metadata/apps.droidnotify.txt b/metadata/apps.droidnotify.txt
index 498f9411bb..3a8703a8ec 100644
--- a/metadata/apps.droidnotify.txt
+++ b/metadata/apps.droidnotify.txt
@@ -83,7 +83,6 @@ Build:3.19,52
prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$FacebookSDK$$@' project.properties && \
sed -i 's@\(android.library.reference.2=\).*@\1$$Color-Picker$$@' project.properties
-# Had to force target this time
Build:3.20,53
commit=1039
srclibs=FacebookSDK@c58af0b,Color-Picker@5d697049fb
@@ -136,7 +135,10 @@ Build:3.29.2,67
sed -i 's@\(android.library.reference.2=\).*@\1$$Color-Picker$$@' project.properties
target=android-17
-# Use Color-Picker-2 next time
+Maintainer Notes:
+Use Color-Picker-2 next time
+.
+
Auto Update Mode:None
Update Check Mode:RepoManifest
Current Version:3.29.2
diff --git a/metadata/at.bitfire.cadroid.txt b/metadata/at.bitfire.cadroid.txt
index aa94251388..5101e1f22d 100644
--- a/metadata/at.bitfire.cadroid.txt
+++ b/metadata/at.bitfire.cadroid.txt
@@ -4,7 +4,6 @@ Web Site:http://cadroid.bitfire.at/#donations
Source Code:https://github.com/bitfireAT/cadroid
Issue Tracker:https://github.com/bitfireAT/cadroid/issues
Donate:http://cadroid.bitfire.at/#donations
-# FlattrID:ad80f1bb8abbdacfba8e60c85d23791f
FlattrID:2100160
Bitcoin:1KSCy7RHztKuhW9fLLaUYqdwdC2iwbejZU
@@ -67,6 +66,10 @@ Build:1.0.3,8
gradle=yes
rm=app/libs/*
+Maintainer Notes:
+FlattrID:ad80f1bb8abbdacfba8e60c85d23791f
+.
+
Auto Update Mode:Version v%v
Update Check Mode:Tags
Current Version:1.0.3
diff --git a/metadata/at.tomtasche.reader.txt b/metadata/at.tomtasche.reader.txt
index d6b333d108..7b5decf85a 100644
--- a/metadata/at.tomtasche.reader.txt
+++ b/metadata/at.tomtasche.reader.txt
@@ -55,7 +55,6 @@ Build:2.0.6,33
cp $$aFileChooser$$/libs/android-support-v4.jar $$FilePicker$$/libs/ && \
rm -rf libs/GoogleAdMobAdsSdk-6.1.0.jar libs/androidbillinglibrary_22092012.jar tests
-# careful deleting lines in submodule source: they don't reappear
Build:2.0.7,34
commit=771437a702
init=git config -f .gitmodules --remove-section submodule.test && \
diff --git a/metadata/caldwell.ben.trolly.txt b/metadata/caldwell.ben.trolly.txt
index 640b4dc1ba..757b633f91 100644
--- a/metadata/caldwell.ben.trolly.txt
+++ b/metadata/caldwell.ben.trolly.txt
@@ -15,13 +15,16 @@ other apps to automatically add items to the shopping list.
Repo Type:git-svn
Repo:https://trolly.googlecode.com/svn;trunk=trunk;tags=tags
-# It needs a file from OpenIntents, so let's get it from Subversion...
Build:1.4,6
commit=trolly_1.4
prebuild=mkdir -p src/org/openintents/intents && \
svn cat -r 3070 https://openintents.googlecode.com/svn/trunk/shoppinglist/ShoppingList/src/org/openintents/intents/ShoppingListIntents.java >src/org/openintents/intents/ShoppingListIntents.java
target=android-4
+Maintainer Notes:
+It needs a file from OpenIntents, so let's get it from Subversion...
+.
+
Auto Update Mode:None
Update Check Mode:Tags
Current Version:1.4
diff --git a/metadata/com.MarcosDiez.shareviahttp.txt b/metadata/com.MarcosDiez.shareviahttp.txt
index 1581211fde..3414bfabef 100644
--- a/metadata/com.MarcosDiez.shareviahttp.txt
+++ b/metadata/com.MarcosDiez.shareviahttp.txt
@@ -22,14 +22,12 @@ slowly. The server can be stopped at any time from the screen that shows the URL
Repo Type:git
Repo:https://github.com/marcosdiez/shareviahttp.git
-# old repo
Build:1.10,11
commit=f6566f6ae61d
subdir=ShareViaHttp
prebuild=wget http://repo1.maven.org/maven2/com/googlecode/androidannotations/androidannotations/2.5.1/androidannotations-2.5.1.jar -P libs/
target=android-15
-# old repo
Build:1.11,12
commit=ffd7026be9d0
subdir=ShareViaHttp
diff --git a/metadata/com.adstrosoftware.launchappops.txt b/metadata/com.adstrosoftware.launchappops.txt
index 8172d26d64..4447ce6578 100644
--- a/metadata/com.adstrosoftware.launchappops.txt
+++ b/metadata/com.adstrosoftware.launchappops.txt
@@ -21,11 +21,6 @@ Build:1.0,1
gradle=yes
prebuild=sed -i 's/18.0.1/18.0.1/g' build.gradle
-# Build Version:1.0,1,6c1b72946,subdir=app/src/main,\
-# extlibs=android/android-support-v4r13.jar,\
-# target=android-18,\
-# prebuild=echo 'source.dir=java' > ant.properties
-# problem with gradle on build server
Auto Update Mode:None
Update Check Mode:RepoManifest
Current Version:1.0
diff --git a/metadata/com.alfray.timeriffic.txt b/metadata/com.alfray.timeriffic.txt
index edc4419401..c6d29af2fd 100644
--- a/metadata/com.alfray.timeriffic.txt
+++ b/metadata/com.alfray.timeriffic.txt
@@ -18,7 +18,6 @@ Build:1.09.03,10903
subdir=Timeriffic
oldsdkloc=yes
-# This version was from https://timeriffic.googlecode.com/hg
Build:1.09.05,10905
commit=fc40dccbb9
subdir=Timeriffic
@@ -29,6 +28,10 @@ Build:1.10.01,11001
disable=Source code is not published
commit=unknown - see disabled
+Maintainer Notes:
+1.09.05 was from https://timeriffic.googlecode.com/hg
+.
+
Auto Update Mode:None
Update Check Mode:Static
Current Version:1.09.05
diff --git a/metadata/com.andrew.apollo.txt b/metadata/com.andrew.apollo.txt
index 9831a0e8ba..d6e2842f8b 100644
--- a/metadata/com.andrew.apollo.txt
+++ b/metadata/com.andrew.apollo.txt
@@ -19,20 +19,8 @@ really requires 4.1 or later. If your device runs 4.0.X, stick with 1.0.
.
Repo Type:git
-# Repo:https://github.com/adneal/Apollo-CM
Repo:https://github.com/CyanogenMod/android_packages_apps_Apollo
-# Build Version:1.0,1,9102afb63c,patch=lyrics.patch,\
-# srclibs=ActionBarSherlock@4.2.0;ViewPagerIndicator@2.4.1;AppMsg@d5859f0cc4,\
-# prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-# sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && \
-# sed -i 's@\(android.library.reference.3=\).*@\1$$AppMsg$$@' project.properties && \
-# cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
-# cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \
-# rm src/com/andrew/apollo/lyrics/LyricsWikiProvider.java \
-# src/com/andrew/apollo/ui/fragments/LyricsFragment.java && \
-# find . -type f -print0 | xargs -0 sed -i 's/Crouton/AppMsg/g' && \
-# sed -i '/proguard/d' project.properties
Build:1.1,2
commit=cm-10.1.0-RC1
extlibs=android/android-support-v4.jar
diff --git a/metadata/com.android.inputmethod.norwegian.txt b/metadata/com.android.inputmethod.norwegian.txt
index 4f39c0c532..aaf1bcbbce 100644
--- a/metadata/com.android.inputmethod.norwegian.txt
+++ b/metadata/com.android.inputmethod.norwegian.txt
@@ -14,13 +14,9 @@ Norwegian, Swedish, Danish, Faroese, German, Icelandic and Northern Sámi
keyboard layouts.
.
-# Switched from svn to git
Repo Type:git
Repo:https://code.google.com/p/scandinavian-keyboard
-# Build Version:1.4.4,13,15,target=android-4
-# Build Version:1.4.6,15,17,target=android-4
-# For android-15 only
Build:1.4.7,16
commit=9515ee354b59
target=android-4
@@ -30,7 +26,6 @@ Includes binaries!
.
Auto Update Mode:None
-# Device-variable
Update Check Mode:Static
Current Version:1.4.6
Current Version Code:15
diff --git a/metadata/com.android.keepass.txt b/metadata/com.android.keepass.txt
index 67d9473c57..591d255e49 100644
--- a/metadata/com.android.keepass.txt
+++ b/metadata/com.android.keepass.txt
@@ -19,8 +19,6 @@ natively.
Repo Type:git
Repo:https://github.com/bpellin/keepassdroid.git
-# Build Version:1.8.5,65,2c401b23c11693cd192b
-# Build Version:1.8.4,64,8700924ffad7bddd5b65
Build:1.9,76
commit=v1.9
@@ -67,7 +65,6 @@ Build:1.9.17,94
target=android-8
buildjni=yes
-# see jni/prep_build.sh for crypto source urls
Build:1.9.18.3,98
commit=v1.9.18.3
prebuild=cd jni && \
@@ -186,6 +183,8 @@ Build:2.0.4,138
Maintainer Notes:
Build tries to download file from an expired domain. We force IP for now.
However, actually upstream should include the downloaded sources directly.
+
+see jni/prep_build.sh for crypto source urls
.
Auto Update Mode:None