From a4b6549927c284e78a4efdf76e0168a8df529697 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 16 May 2018 22:49:57 +0200 Subject: [PATCH] tests: adapt to spdx v4.0.0 --- .../app.with.special.build.params.yml | 2 +- tests/metadata-rewrite-yml/org.fdroid.fdroid.yml | 2 +- tests/metadata/app.with.special.build.params.txt | 2 +- tests/metadata/com.politedroid.txt | 2 +- tests/metadata/dump/com.politedroid.yaml | 2 +- tests/metadata/dump/org.adaway.yaml | 2 +- tests/metadata/dump/org.smssecure.smssecure.yaml | 2 +- tests/metadata/dump/org.videolan.vlc.yaml | 2 +- tests/metadata/info.guardianproject.checkey.txt | 2 +- tests/metadata/info.guardianproject.urzip.yml | 2 +- tests/metadata/obb.main.oldversion.txt | 2 +- tests/metadata/obb.main.twoversions.txt | 2 +- tests/metadata/obb.mainpatch.current.txt | 2 +- tests/metadata/org.adaway.json | 2 +- tests/metadata/org.fdroid.fdroid.txt | 2 +- tests/metadata/org.smssecure.smssecure.txt | 2 +- tests/metadata/org.videolan.vlc.yml | 2 +- tests/metadata/souch.smsbypass.txt | 2 +- tests/repo/index-v1.json | 12 ++++++------ tests/repo/index.xml | 12 ++++++------ tests/run-tests | 2 +- 21 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/metadata-rewrite-yml/app.with.special.build.params.yml b/tests/metadata-rewrite-yml/app.with.special.build.params.yml index 2b55701f..a8925657 100644 --- a/tests/metadata-rewrite-yml/app.with.special.build.params.yml +++ b/tests/metadata-rewrite-yml/app.with.special.build.params.yml @@ -2,7 +2,7 @@ AntiFeatures: - UpstreamNonFree Categories: - System -License: GPL-3.0 +License: GPL-3.0-only SourceCode: https://github.com/loadrunner/Facebook-Contact-Sync IssueTracker: https://github.com/loadrunner/Facebook-Contact-Sync/issues diff --git a/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml b/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml index af3a767f..9471f9a6 100644 --- a/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml +++ b/tests/metadata-rewrite-yml/org.fdroid.fdroid.yml @@ -1,6 +1,6 @@ Categories: - System -License: GPL-3.0+ +License: GPL-3.0-or-later WebSite: https://f-droid.org SourceCode: https://gitlab.com/fdroid/fdroidclient IssueTracker: https://gitlab.com/fdroid/fdroidclient/issues diff --git a/tests/metadata/app.with.special.build.params.txt b/tests/metadata/app.with.special.build.params.txt index db4970eb..3592fbce 100644 --- a/tests/metadata/app.with.special.build.params.txt +++ b/tests/metadata/app.with.special.build.params.txt @@ -1,6 +1,6 @@ AntiFeatures:UpstreamNonFree Categories:System -License:GPL-3.0 +License:GPL-3.0-only Web Site: Source Code:https://github.com/loadrunner/Facebook-Contact-Sync Issue Tracker:https://github.com/loadrunner/Facebook-Contact-Sync/issues diff --git a/tests/metadata/com.politedroid.txt b/tests/metadata/com.politedroid.txt index d56c0e8d..8252f624 100644 --- a/tests/metadata/com.politedroid.txt +++ b/tests/metadata/com.politedroid.txt @@ -1,5 +1,5 @@ Categories:Time -License:GPL-3.0 +License:GPL-3.0-only Web Site: Source Code:https://github.com/miguelvps/PoliteDroid Issue Tracker:https://github.com/miguelvps/PoliteDroid/issues diff --git a/tests/metadata/dump/com.politedroid.yaml b/tests/metadata/dump/com.politedroid.yaml index bf0b9b6b..be2b9f43 100644 --- a/tests/metadata/dump/com.politedroid.yaml +++ b/tests/metadata/dump/com.politedroid.yaml @@ -18,7 +18,7 @@ Donate: null FlattrID: null IssueTracker: https://github.com/miguelvps/PoliteDroid/issues LiberapayID: null -License: GPL-3.0 +License: GPL-3.0-only Litecoin: null MaintainerNotes: '' Name: null diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml index b31b2a04..ac07517f 100644 --- a/tests/metadata/dump/org.adaway.yaml +++ b/tests/metadata/dump/org.adaway.yaml @@ -41,7 +41,7 @@ Donate: http://sufficientlysecure.org/index.php/adaway FlattrID: '369138' IssueTracker: https://github.com/dschuermann/ad-away/issues LiberapayID: null -License: GPL-3.0 +License: GPL-3.0-only Litecoin: null MaintainerNotes: '' Name: null diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml index bcbffd6d..e9491640 100644 --- a/tests/metadata/dump/org.smssecure.smssecure.yaml +++ b/tests/metadata/dump/org.smssecure.smssecure.yaml @@ -38,7 +38,7 @@ Donate: null FlattrID: null IssueTracker: https://github.com/SMSSecure/SMSSecure/issues LiberapayID: null -License: GPL-3.0 +License: GPL-3.0-only Litecoin: null MaintainerNotes: '' Name: null diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index e40baaa1..6009fa19 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -25,7 +25,7 @@ Donate: http://www.videolan.org/contribute.html#money FlattrID: null IssueTracker: http://www.videolan.org/support/index.html#bugs LiberapayID: null -License: GPL-3.0 +License: GPL-3.0-only 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 8e57eef0..c6d7557c 100644 --- a/tests/metadata/info.guardianproject.checkey.txt +++ b/tests/metadata/info.guardianproject.checkey.txt @@ -1,5 +1,5 @@ Categories:Development,GuardianProject -License:GPL-3.0 +License:GPL-3.0-only 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 1406d43e..8bb3cd1e 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: GPL-3.0 +License: GPL-3.0-only 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 943f0c15..0a4e4956 100644 --- a/tests/metadata/obb.main.oldversion.txt +++ b/tests/metadata/obb.main.oldversion.txt @@ -1,5 +1,5 @@ Categories:Development -License:GPL-3.0 +License:GPL-3.0-only 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 d358da88..69fb5909 100644 --- a/tests/metadata/obb.main.twoversions.txt +++ b/tests/metadata/obb.main.twoversions.txt @@ -1,5 +1,5 @@ Categories:Development -License:GPL-3.0 +License:GPL-3.0-only 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 2007a69e..7cc4ae64 100644 --- a/tests/metadata/obb.mainpatch.current.txt +++ b/tests/metadata/obb.mainpatch.current.txt @@ -1,5 +1,5 @@ Categories:Development -License:GPL-3.0 +License:GPL-3.0-only Source Code:https://github.com/eighthave/urzip Bitcoin:1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk diff --git a/tests/metadata/org.adaway.json b/tests/metadata/org.adaway.json index 7a09ef5d..df71f112 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": "GPL-3.0", + "License": "GPL-3.0-only", "Provides": "org.sufficientlysecure.adaway", "Repo": "https://github.com/dschuermann/ad-away.git", "RepoType": "git", diff --git a/tests/metadata/org.fdroid.fdroid.txt b/tests/metadata/org.fdroid.fdroid.txt index 4d38c837..f5a5e199 100644 --- a/tests/metadata/org.fdroid.fdroid.txt +++ b/tests/metadata/org.fdroid.fdroid.txt @@ -1,5 +1,5 @@ Categories:System -License:GPL-3.0+ +License:GPL-3.0-or-later Web Site:https://f-droid.org Source Code:https://gitlab.com/fdroid/fdroidclient Issue Tracker:https://gitlab.com/fdroid/fdroidclient/issues diff --git a/tests/metadata/org.smssecure.smssecure.txt b/tests/metadata/org.smssecure.smssecure.txt index 38ab004f..bf41a061 100644 --- a/tests/metadata/org.smssecure.smssecure.txt +++ b/tests/metadata/org.smssecure.smssecure.txt @@ -1,5 +1,5 @@ Categories:Phone & SMS -License:GPL-3.0 +License:GPL-3.0-only 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 33c46f13..61c8678a 100644 --- a/tests/metadata/org.videolan.vlc.yml +++ b/tests/metadata/org.videolan.vlc.yml @@ -1,6 +1,6 @@ Categories: - Multimedia -License: GPL-3.0 +License: GPL-3.0-only 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/metadata/souch.smsbypass.txt b/tests/metadata/souch.smsbypass.txt index 6b16e050..d73822f0 100644 --- a/tests/metadata/souch.smsbypass.txt +++ b/tests/metadata/souch.smsbypass.txt @@ -1,5 +1,5 @@ Categories:Phone & SMS -License:GPL-3.0 +License:GPL-3.0-only Web Site:https://gitlab.com/souch/SMSbypass Source Code:https://gitlab.com/souch/SMSbypass/tree/HEAD Issue Tracker:https://gitlab.com/souch/SMSbypass/issues diff --git a/tests/repo/index-v1.json b/tests/repo/index-v1.json index 912f610c..9037be37 100644 --- a/tests/repo/index-v1.json +++ b/tests/repo/index-v1.json @@ -31,7 +31,7 @@ "donate": "http://rodolphe.souchaud.free.fr/donate", "flattrID": "cad90e036b975ed129a3ce80a0750466", "issueTracker": "https://gitlab.com/souch/SMSbypass/issues", - "license": "GPL-3.0", + "license": "GPL-3.0-only", "name": "Battery level", "sourceCode": "https://gitlab.com/souch/SMSbypass/tree/HEAD", "summary": "Filter SMS and show them in a fake app", @@ -78,7 +78,7 @@ "Development" ], "suggestedVersionCode": "99999999", - "license": "GPL-3.0", + "license": "GPL-3.0-only", "name": "OBB Main Old Version", "sourceCode": "https://github.com/eighthave/urzip", "added": 1388448000000, @@ -92,7 +92,7 @@ "Development" ], "suggestedVersionCode": "99999999", - "license": "GPL-3.0", + "license": "GPL-3.0-only", "name": "OBB Main Two Versions", "sourceCode": "https://github.com/eighthave/urzip", "added": 1444608000000, @@ -106,7 +106,7 @@ "Development" ], "suggestedVersionCode": "99999999", - "license": "GPL-3.0", + "license": "GPL-3.0-only", "name": "OBB Main/Patch Current", "sourceCode": "https://github.com/eighthave/urzip", "added": 1461369600000, @@ -134,7 +134,7 @@ "suggestedVersionCode": "6", "description": "

Activates silent mode during calendar events.

", "issueTracker": "https://github.com/miguelvps/PoliteDroid/issues", - "license": "GPL-3.0", + "license": "GPL-3.0-only", "name": "Polite Droid", "sourceCode": "https://github.com/miguelvps/PoliteDroid", "summary": "Calendar tool", @@ -155,7 +155,7 @@ "suggestedVersionCode": "2147483647", "description": "

It\u2019s Urzip \u662f\u4e00\u4e2a\u83b7\u5f97\u5df2\u5b89\u88c5 APK \u76f8\u5173\u4fe1\u606f\u7684\u5b9e\u7528\u5de5\u5177\u3002\u5b83\u4ece\u60a8\u7684\u8bbe\u5907\u4e0a\u5df2\u5b89\u88c5\u7684\u6240\u6709\u5e94\u7528\u5f00\u59cb\uff0c\u4e00\u952e\u89e6\u6478\u5373\u53ef\u663e\u793a APK \u7684\u6307\u7eb9\uff0c\u5e76\u4e14\u63d0\u4f9b\u5230\u8fbe virustotal.com \u548c androidobservatory.org \u7684\u5feb\u6377\u94fe\u63a5\uff0c\u8ba9\u60a8\u65b9\u4fbf\u5730\u4e86\u89e3\u7279\u5b9a APK \u7684\u6863\u6848\u3002\u5b83\u8fd8\u53ef\u4ee5\u8ba9\u60a8\u5bfc\u51fa\u7b7e\u540d\u8bc1\u4e66\u548c\u751f\u6210 ApkSignaturePin Pin \u6587\u4ef6\u4f9b TrustedIntents \u5e93\u4f7f\u7528\u3002

\u2605 Urzip \u652f\u6301\u4e0b\u5217\u8bed\u8a00\uff1a Deutsch, English, espa\u00f1ol, suomi, \u65e5\u672c\u8a9e, \ud55c\uad6d\uc5b4, Norsk, portugu\u00eas (Portugal), \u0420\u0443\u0441\u0441\u043a\u0438\u0439, Sloven\u0161\u010dina, T\u00fcrk\u00e7e \u6ca1\u770b\u5230\u60a8\u7684\u8bed\u8a00\uff1f\u5e2e\u5fd9\u7ffb\u8bd1\u672c\u5e94\u7528\u5427\uff1a https://www.transifex.com/projects/p/urzip

\u2605 \u81f4\u7528\u6237\uff1a\u6211\u4eec\u8fd8\u7f3a\u5c11\u4f60\u559c\u6b22\u7684\u529f\u80fd\uff1f\u53d1\u73b0\u4e86\u4e00\u4e2a bug\uff1f\u8bf7\u544a\u8bc9\u6211\u4eec\uff01\u6211\u4eec\u4e50\u4e8e\u542c\u53d6\u60a8\u7684\u610f\u89c1\u3002\u8bf7\u53d1\u9001\u7535\u5b50\u90ae\u4ef6\u81f3: support@guardianproject.info \u6216\u8005\u52a0\u5165\u6211\u4eec\u7684\u804a\u5929\u5ba4 https://guardianproject.info/contact

", "issueTracker": "https://dev.guardianproject.info/projects/urzip/issues", - "license": "GPL-3.0", + "license": "GPL-3.0-only", "name": "urzip-\u03c0\u00c7\u00c7\u03c0\u00c7\u00c7\u73b0\u4ee3\u6c49\u8bed\u901a\u7528\u5b57-\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438-\u0639\u0631\u0628\u064a1234", "sourceCode": "https://github.com/guardianproject/urzip", "summary": "\u4e00\u4e2a\u5b9e\u7528\u5de5\u5177\uff0c\u83b7\u53d6\u5df2\u5b89\u88c5\u5728\u60a8\u7684\u8bbe\u5907\u4e0a\u7684\u5e94\u7528\u7684\u6709\u5173\u4fe1\u606f", diff --git a/tests/repo/index.xml b/tests/repo/index.xml index 9b6ef50a..4ad71403 100644 --- a/tests/repo/index.xml +++ b/tests/repo/index.xml @@ -16,7 +16,7 @@ Filter SMS and show them in a fake app souch.smsbypass.9.png <p>In order to keep away curious eyes, SMS-bypass filters incoming SMS messages before they reach your inbox. Based on bughunter2.smsfilter.</p><p>Features:</p><ul><li> Discrete fake app "Battery level": Long tap on Battery percentage will show SMS.</li><li> Filter incoming SMS specified address: redirect the SMS to SMS-bypass messages list; remove SMS arrival sound or vibration; show a discreet notification icon (battery level); vibrate if checked in settings</li><li> Add contact from contact list</li><li> Export messages to a text file</li></ul> - GPL-3.0 + GPL-3.0-only Phone & SMS Phone & SMS https://gitlab.com/souch/SMSbypass @@ -103,7 +103,7 @@ obb.main.oldversion.1444412523.png <p>No description available</p> - GPL-3.0 + GPL-3.0-only Development Development @@ -138,7 +138,7 @@ obb.main.twoversions.1101617.png <p>No description available</p> - GPL-3.0 + GPL-3.0-only Development Development @@ -196,7 +196,7 @@ obb.mainpatch.current.1619.png <p>No description available</p> - GPL-3.0 + GPL-3.0-only Development Development @@ -229,7 +229,7 @@ Calendar tool com.politedroid.6.png <p>Activates silent mode during calendar events.</p> - GPL-3.0 + GPL-3.0-only Time Time @@ -294,7 +294,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> - GPL-3.0 + GPL-3.0-only Development,GuardianProject,1,2.0 Development https://dev.guardianproject.info/projects/urzip diff --git a/tests/run-tests b/tests/run-tests index df03a2e2..cad3bf90 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -591,7 +591,7 @@ REPOROOT=`create_test_dir` cd $REPOROOT mkdir repo mkdir metadata -echo "License:GPL-2.0" >> metadata/fake.txt +echo "License:GPL-2.0-only" >> metadata/fake.txt echo "Summary:Yup still fake" >> metadata/fake.txt echo "Categories:Internet" >> metadata/fake.txt echo "Description:" >> metadata/fake.txt