From 4b139ec58dab39ebc02d63d90dbdec0e876fed1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 1 Nov 2015 12:44:48 +0100 Subject: [PATCH] Massively remove all wrongly added auto updates These were caused due to checkupdates taking versions from AM.xml files in libraries. This is now fixed in fdroidserver. --- metadata/at.zweng.bankomatinfos.txt | 3 --- metadata/ch.ihdg.calendarcolor.txt | 5 ----- .../com.lgallardo.qbittorrentclientpro.txt | 19 ------------------- metadata/com.mehmetakiftutuncu.eshotroid.txt | 4 ---- metadata/de.azapps.mirakel.dashclock.txt | 6 ------ metadata/de.k3b.android.androFotoFinder.txt | 5 ----- metadata/indrora.atomic.txt | 5 ----- metadata/it.greenaddress.cordova.txt | 7 ------- metadata/nl.mpcjanssen.simpletask.txt | 5 ----- metadata/ohm.quickdice.txt | 6 ------ metadata/org.adaway.txt | 7 ------- metadata/org.janb.shoppinglist.txt | 6 ------ .../org.sufficientlysecure.localcalendar.txt | 5 ----- metadata/org.thialfihar.android.apg.txt | 6 ------ metadata/org.yaaic.txt | 5 ----- 15 files changed, 94 deletions(-) diff --git a/metadata/at.zweng.bankomatinfos.txt b/metadata/at.zweng.bankomatinfos.txt index 46c9e9ae11..df96f30513 100644 --- a/metadata/at.zweng.bankomatinfos.txt +++ b/metadata/at.zweng.bankomatinfos.txt @@ -37,9 +37,6 @@ Build:1.2.5,11 Build:1.2.6,12 commit=b20e5db6d02f6fd108a582400ab5565f079f2d2a -Build:1.2.6-END-OF-LIFE,17 - commit=eae28c3fb6952dc8e636c482060e447866b9a3b1 - Auto Update Mode:None Update Check Mode:RepoManifest/fdroid-phase-out Current Version:1.2.6-END-OF-LIFE diff --git a/metadata/ch.ihdg.calendarcolor.txt b/metadata/ch.ihdg.calendarcolor.txt index 2ca4b0017f..1c2a6c7065 100644 --- a/metadata/ch.ihdg.calendarcolor.txt +++ b/metadata/ch.ihdg.calendarcolor.txt @@ -39,11 +39,6 @@ Build:0.2,2 subdir=app gradle=yes -Build:1.4,14 - commit=1.4 - subdir=app - gradle=yes - Auto Update Mode:Version %v Update Check Mode:Tags Current Version:1.4 diff --git a/metadata/com.lgallardo.qbittorrentclientpro.txt b/metadata/com.lgallardo.qbittorrentclientpro.txt index 2c01ddc9aa..c448ee6a1d 100644 --- a/metadata/com.lgallardo.qbittorrentclientpro.txt +++ b/metadata/com.lgallardo.qbittorrentclientpro.txt @@ -40,25 +40,6 @@ Build:3.9.0,390 popd && \ cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/ -Build:4.2.1,421 - commit=v4.2.1 - subdir=qBittorrentClient/app - patch=remove_ads_390.patch - gradle=pro - srclibs=ApacheHttpClient@4.3.5,ApacheHttpCore@4.3.2 - rm=qBittorrentClient/app/libs/* - prebuild=sed -i '/com.google.android.gms:play-services/d' build.gradle - build=pushd $$ApacheHttpClient$$/httpclient/ && \ - $$MVN3$$ package && \ - popd && \ - pushd $$ApacheHttpClient$$/httpmime/ && \ - $$MVN3$$ package && \ - popd && \ - pushd $$ApacheHttpCore$$/httpcore && \ - $$MVN3$$ package && \ - popd && \ - cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/ - Auto Update Mode:Version v%v Update Check Mode:Tags Current Version:4.2.1 diff --git a/metadata/com.mehmetakiftutuncu.eshotroid.txt b/metadata/com.mehmetakiftutuncu.eshotroid.txt index dca5bee57a..dedc13fa24 100644 --- a/metadata/com.mehmetakiftutuncu.eshotroid.txt +++ b/metadata/com.mehmetakiftutuncu.eshotroid.txt @@ -35,10 +35,6 @@ Build:2.3,6 commit=v2.3 subdir=Eshotroid -Build:2.1.1,2110 - commit=v2.1.1 - subdir=Eshotroid - Auto Update Mode:Version v%v Update Check Mode:Tags Current Version:2.1.1 diff --git a/metadata/de.azapps.mirakel.dashclock.txt b/metadata/de.azapps.mirakel.dashclock.txt index 97b05013bc..fb4b585573 100644 --- a/metadata/de.azapps.mirakel.dashclock.txt +++ b/metadata/de.azapps.mirakel.dashclock.txt @@ -54,12 +54,6 @@ Build:2.2,13 gradle=yes rm=appcompat,dashclock/libs/*,model/libs/*,helper/libs/* -Build:2.8,71 - commit=v2.8-dashclock - subdir=dashclock - gradle=yes - rm=appcompat,dashclock/libs/*,model/libs/*,helper/libs/* - Maintainer Notes: :helper provides joda-time:joda-time:2.4 :model provides com.google.code.gson:gson:2.2.2 diff --git a/metadata/de.k3b.android.androFotoFinder.txt b/metadata/de.k3b.android.androFotoFinder.txt index 379f34748f..10d215f369 100644 --- a/metadata/de.k3b.android.androFotoFinder.txt +++ b/metadata/de.k3b.android.androFotoFinder.txt @@ -58,11 +58,6 @@ Build:0.4.1.150911,8 subdir=app gradle=yes -Build:1.2.2-SHAPSHOT,122 - commit=v1.2.2-SHAPSHOT - subdir=app - gradle=yes - Maintainer Notes: Please use git-branch "FDroid" for FDroid-builds. . diff --git a/metadata/indrora.atomic.txt b/metadata/indrora.atomic.txt index e18e9b2689..03bbba88b8 100644 --- a/metadata/indrora.atomic.txt +++ b/metadata/indrora.atomic.txt @@ -42,11 +42,6 @@ Build:1.19,19 subdir=application submodules=yes -Build:4.2.0,100 - commit=v4.2.0 - subdir=application - submodules=yes - Auto Update Mode:Version v%v Update Check Mode:Tags Current Version:4.2.0 diff --git a/metadata/it.greenaddress.cordova.txt b/metadata/it.greenaddress.cordova.txt index 0910233351..a70de4b000 100644 --- a/metadata/it.greenaddress.cordova.txt +++ b/metadata/it.greenaddress.cordova.txt @@ -209,13 +209,6 @@ Build:0.0.72,72 scandelete=plugins/org.apache.cordova.vibration/src/blackberry10,platforms/android/libs/armeabi/libscrypt.so,platforms/android/scrypt/src build=./prepare_fdroid.sh -Build:4.3.1,87 - commit=4.3.1 - subdir=platforms/android - submodules=yes - scandelete=plugins/org.apache.cordova.vibration/src/blackberry10,platforms/android/libs/armeabi/libscrypt.so,platforms/android/scrypt/src - build=./prepare_fdroid.sh - Maintainer Notes: scandelete libscrypt.so - it is built by F-Droid via prepare_fdroid.sh, but it is still in GreenAddress repo for users who don't want to use NDK, diff --git a/metadata/nl.mpcjanssen.simpletask.txt b/metadata/nl.mpcjanssen.simpletask.txt index bcc77a66be..3f23a5ba34 100644 --- a/metadata/nl.mpcjanssen.simpletask.txt +++ b/metadata/nl.mpcjanssen.simpletask.txt @@ -424,11 +424,6 @@ Build:6.0.8,1582 init=rm libs/*.jar gradle=cloudless -Build:1.1,2001 - commit=1.1 - init=rm libs/*.jar - gradle=cloudless - Auto Update Mode:Version %v Update Check Mode:Tags Current Version:1.1 diff --git a/metadata/ohm.quickdice.txt b/metadata/ohm.quickdice.txt index 41f885c371..7945bdcd05 100644 --- a/metadata/ohm.quickdice.txt +++ b/metadata/ohm.quickdice.txt @@ -53,12 +53,6 @@ Build:2.1.2,41 extlibs=android/android-support-v4.jar prebuild=sed -i -e 's|\\\\|/|g' project.properties -Build:2.4.0,60 - commit=v_2.4.0 - subdir=Quick Dice - extlibs=android/android-support-v4.jar - prebuild=sed -i -e 's|\\\\|/|g' project.properties - Auto Update Mode:Version v_%v Update Check Mode:Tags Current Version:2.4.0 diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt index 465356b61f..6398e5ce9e 100644 --- a/metadata/org.adaway.txt +++ b/metadata/org.adaway.txt @@ -255,13 +255,6 @@ Build:3.1,55 buildjni=yes preassemble=renameExecutables -Build:4.4.0,440 - commit=v4.4.0 - subdir=AdAway - gradle=yes - buildjni=yes - preassemble=renameExecutables - Auto Update Mode:Version v%v Update Check Mode:Tags Current Version:4.4.0 diff --git a/metadata/org.janb.shoppinglist.txt b/metadata/org.janb.shoppinglist.txt index c4ee961c23..0fb1444bef 100644 --- a/metadata/org.janb.shoppinglist.txt +++ b/metadata/org.janb.shoppinglist.txt @@ -39,12 +39,6 @@ Build:1.3,4 gradle=yes prebuild=rm -fR ../build -Build:5.1.1,511 - commit=v5.1.1 - subdir=app - gradle=yes - prebuild=rm -fR ../build - Auto Update Mode:Version v%v Update Check Mode:Tags Current Version:5.1.1 diff --git a/metadata/org.sufficientlysecure.localcalendar.txt b/metadata/org.sufficientlysecure.localcalendar.txt index 208f781c19..0169f6d1d7 100644 --- a/metadata/org.sufficientlysecure.localcalendar.txt +++ b/metadata/org.sufficientlysecure.localcalendar.txt @@ -58,11 +58,6 @@ Build:1.7,8 subdir=Offline-Calendar gradle=yes -Build:1.1,11 - commit=v1.1 - subdir=Offline-Calendar - gradle=yes - Auto Update Mode:Version v%v Update Check Mode:Tags Current Version:1.1 diff --git a/metadata/org.thialfihar.android.apg.txt b/metadata/org.thialfihar.android.apg.txt index cf98716e4f..ed7769fec2 100644 --- a/metadata/org.thialfihar.android.apg.txt +++ b/metadata/org.thialfihar.android.apg.txt @@ -29,12 +29,6 @@ Build:1.1.1,11199 submodules=yes gradle=yes -Build:2.3.1 beta4+-fdroid,23104 - commit=v2.3.1 beta4+-fdroid - subdir=apg - submodules=yes - gradle=yes - Auto Update Mode:Version +-fdroid v%v Update Check Mode:Tags Current Version:2.3.1 beta4 diff --git a/metadata/org.yaaic.txt b/metadata/org.yaaic.txt index a0635a2306..9a517d1353 100644 --- a/metadata/org.yaaic.txt +++ b/metadata/org.yaaic.txt @@ -41,11 +41,6 @@ Build:1.1,13 subdir=app gradle=yes -Build:4.1.0,90 - commit=v4.1.0 - subdir=app - gradle=yes - Auto Update Mode:Version v%v Update Check Mode:Tags Current Version:4.1.0