From: Hans-Christoph Steiner Date: Mon, 15 May 2017 14:58:10 +0000 (+0200) Subject: make tests pass new lint rules X-Git-Tag: 0.8~52^2 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=114d5dc8c68e125da6f55cadc38874e032ab189d;p=fdroidserver.git make tests pass new lint rules --- diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml index 3e5b2394..ae82809d 100644 --- a/tests/metadata/dump/org.adaway.yaml +++ b/tests/metadata/dump/org.adaway.yaml @@ -40,7 +40,7 @@ Disabled: null Donate: http://sufficientlysecure.org/index.php/adaway FlattrID: '369138' IssueTracker: https://github.com/dschuermann/ad-away/issues -License: GPLv3 +License: GPL-3.0 Litecoin: null MaintainerNotes: '' Name: null diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml index 06b70b8d..ea608b97 100644 --- a/tests/metadata/dump/org.smssecure.smssecure.yaml +++ b/tests/metadata/dump/org.smssecure.smssecure.yaml @@ -37,7 +37,7 @@ Disabled: null Donate: null FlattrID: null IssueTracker: https://github.com/SMSSecure/SMSSecure/issues -License: GPLv3 +License: GPL-3.0 Litecoin: null MaintainerNotes: '' Name: null diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index e173fcba..dde25b36 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -24,7 +24,7 @@ Disabled: null Donate: http://www.videolan.org/contribute.html#money FlattrID: null IssueTracker: http://www.videolan.org/support/index.html#bugs -License: GPLv3 +License: GPL-3.0 Litecoin: null MaintainerNotes: 'Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile diff --git a/tests/metadata/info.guardianproject.checkey.txt b/tests/metadata/info.guardianproject.checkey.txt index 43faaade..eea6c7be 100644 --- a/tests/metadata/info.guardianproject.checkey.txt +++ b/tests/metadata/info.guardianproject.checkey.txt @@ -1,5 +1,5 @@ Categories:Development,GuardianProject -License:GPLv3 +License:GPL-3.0 Web Site:https://dev.guardianproject.info/projects/checkey Source Code:https://github.com/guardianproject/checkey Issue Tracker:https://dev.guardianproject.info/projects/checkey/issues diff --git a/tests/metadata/info.guardianproject.urzip.yml b/tests/metadata/info.guardianproject.urzip.yml index a1650816..1406d43e 100644 --- a/tests/metadata/info.guardianproject.urzip.yml +++ b/tests/metadata/info.guardianproject.urzip.yml @@ -18,7 +18,7 @@ Description: | ★ 致用户：我们还缺少你喜欢的功能？发现了一个 bug？请告诉我们！我们乐于听取您的意见。请发送电子邮件至: support@guardianproject.info 或者加入我们的聊天室 https://guardianproject.info/contact IssueTracker: https://dev.guardianproject.info/projects/urzip/issues -License: GPLv3 +License: GPL-3.0 Repo: https://github.com/guardianproject/urzip.git RepoType: git SourceCode: https://github.com/guardianproject/urzip diff --git a/tests/metadata/obb.main.oldversion.txt b/tests/metadata/obb.main.oldversion.txt index 56c4a9f5..943f0c15 100644 --- a/tests/metadata/obb.main.oldversion.txt +++ b/tests/metadata/obb.main.oldversion.txt @@ -1,5 +1,5 @@ Categories:Development -License:GPLv3 +License:GPL-3.0 Source Code:https://github.com/eighthave/urzip Bitcoin:1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk diff --git a/tests/metadata/obb.main.twoversions.txt b/tests/metadata/obb.main.twoversions.txt index d06afa36..d358da88 100644 --- a/tests/metadata/obb.main.twoversions.txt +++ b/tests/metadata/obb.main.twoversions.txt @@ -1,5 +1,5 @@ Categories:Development -License:GPLv3 +License:GPL-3.0 Source Code:https://github.com/eighthave/urzip Bitcoin:1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk diff --git a/tests/metadata/obb.mainpatch.current.txt b/tests/metadata/obb.mainpatch.current.txt index 2f7571f5..2007a69e 100644 --- a/tests/metadata/obb.mainpatch.current.txt +++ b/tests/metadata/obb.mainpatch.current.txt @@ -1,5 +1,5 @@ Categories:Development -License:GPLv3 +License:GPL-3.0 Source Code:https://github.com/eighthave/urzip Bitcoin:1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk diff --git a/tests/metadata/org.adaway.json b/tests/metadata/org.adaway.json index c95a8878..dda8ae60 100644 --- a/tests/metadata/org.adaway.json +++ b/tests/metadata/org.adaway.json @@ -22,7 +22,7 @@ "Donate": "http://sufficientlysecure.org/index.php/adaway", "FlattrID": "369138", "IssueTracker": "https://github.com/dschuermann/ad-away/issues", - "License": "GPLv3", + "License": "GPL-3.0", "Provides": "org.sufficientlysecure.adaway", "Repo": "https://github.com/dschuermann/ad-away.git", "RepoType": "git", diff --git a/tests/metadata/org.smssecure.smssecure.txt b/tests/metadata/org.smssecure.smssecure.txt index d4ff2384..655857ef 100644 --- a/tests/metadata/org.smssecure.smssecure.txt +++ b/tests/metadata/org.smssecure.smssecure.txt @@ -1,5 +1,5 @@ Categories:Phone & SMS -License:GPLv3 +License:GPL-3.0 Web Site:http://www.smssecure.org Source Code:https://github.com/SMSSecure/SMSSecure Issue Tracker:https://github.com/SMSSecure/SMSSecure/issues diff --git a/tests/metadata/org.videolan.vlc.yml b/tests/metadata/org.videolan.vlc.yml index 7d38ecce..33c46f13 100644 --- a/tests/metadata/org.videolan.vlc.yml +++ b/tests/metadata/org.videolan.vlc.yml @@ -1,6 +1,6 @@ Categories: - Multimedia -License: GPLv3 +License: GPL-3.0 WebSite: http://www.videolan.org/vlc/download-android.html SourceCode: http://git.videolan.org/?p=vlc-ports/android.git;a=summary IssueTracker: "http://www.videolan.org/support/index.html#bugs" diff --git a/tests/repo/index.xml b/tests/repo/index.xml index 052381a2..88507d52 100644 --- a/tests/repo/index.xml +++ b/tests/repo/index.xml @@ -41,7 +41,7 @@ obb.main.oldversion.1444412523.png <p>No description available</p> - GPLv3 + GPL-3.0 Development Development @@ -76,7 +76,7 @@ obb.main.twoversions.1101617.png <p>No description available</p> - GPLv3 + GPL-3.0 Development Development @@ -134,7 +134,7 @@ obb.mainpatch.current.1619.png <p>No description available</p> - GPLv3 + GPL-3.0 Development Development @@ -167,7 +167,7 @@ 一个实用工具，获取已安装在您的设备上的应用的有关信息 info.guardianproject.urzip.100.png <p>It’s Urzip 是一个获得已安装 APK 相关信息的实用工具。它从您的设备上已安装的所有应用开始，一键触摸即可显示 APK 的指纹，并且提供到达 virustotal.com 和 androidobservatory.org 的快捷链接，让您方便地了解特定 APK 的档案。它还可以让您导出签名证书和生成 ApkSignaturePin Pin 文件供 TrustedIntents 库使用。</p><p>★ Urzip 支持下列语言： Deutsch, English, español, suomi, 日本語, 한국어, Norsk, português (Portugal), Русский, Slovenščina, Türkçe 没看到您的语言？帮忙翻译本应用吧： https://www.transifex.com/projects/p/urzip</p><p>★ 致用户：我们还缺少你喜欢的功能？发现了一个 bug？请告诉我们！我们乐于听取您的意见。请发送电子邮件至: support@guardianproject.info 或者加入我们的聊天室 https://guardianproject.info/contact</p> - GPLv3 + GPL-3.0 Development,GuardianProject,1,2.0 Development https://dev.guardianproject.info/projects/urzip diff --git a/tests/run-tests b/tests/run-tests index 563145a5..f640322e 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -262,7 +262,7 @@ REPOROOT=`create_test_dir` cd $REPOROOT mkdir repo mkdir metadata -echo "License:GPL" >> metadata/fake.txt +echo "License:GPL-2.0" >> metadata/fake.txt echo "Summary:Yup still fake" >> metadata/fake.txt echo "Categories:Internet" >> metadata/fake.txt echo "Description:" >> metadata/fake.txt