From 0040cf521c5d784804432b0ebf5b39b0e951b13d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 09:28:00 +0200 Subject: [PATCH 01/16] set CC license versions based on date when license was set These apps didn't specify the CC license version. This just assumes they wanted the current version when the license was set: https://wiki.creativecommons.org/wiki/License_Versions --- metadata/com.hermit.btreprap.txt | 2 +- metadata/fr.ornidroid.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/com.hermit.btreprap.txt b/metadata/com.hermit.btreprap.txt index de6c3e4f0b..bee389c1ca 100644 --- a/metadata/com.hermit.btreprap.txt +++ b/metadata/com.hermit.btreprap.txt @@ -1,5 +1,5 @@ Categories:Connectivity -License:CC-BY-SA +License:CC-BY-SA-3.0 Web Site: Source Code:https://github.com/pipakin/Android-Bluetooth-Reprap Issue Tracker:https://github.com/pipakin/Android-Bluetooth-Reprap/issues diff --git a/metadata/fr.ornidroid.txt b/metadata/fr.ornidroid.txt index 56f148fa77..0d44059ed9 100644 --- a/metadata/fr.ornidroid.txt +++ b/metadata/fr.ornidroid.txt @@ -1,6 +1,6 @@ Disabled:Non-free license Categories:Science & Education -License:CC-BY-NC +License:CC-BY-NC-4.0 Web Site:https://github.com/giletvin/ornidroid/wiki Source Code:https://github.com/giletvin/ornidroid Issue Tracker: From eb2d8d0274713e2831e97235fc47cece91789348 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 09:40:28 +0200 Subject: [PATCH 02/16] license correction: NetBSD --> BSD-2-Clause-NetBSD --- metadata/it.gtd.abreakout.GameActivity.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/it.gtd.abreakout.GameActivity.txt b/metadata/it.gtd.abreakout.GameActivity.txt index a534468f75..b8e29fb262 100644 --- a/metadata/it.gtd.abreakout.GameActivity.txt +++ b/metadata/it.gtd.abreakout.GameActivity.txt @@ -1,5 +1,5 @@ Categories:Games -License:NetBSD +License:BSD-2-Clause-NetBSD Web Site:http://en.wikipedia.org/wiki/Breakout_(video_game) Source Code:https://github.com/thypon/abreakout Issue Tracker:https://github.com/thypon/abreakout/issues From db2c6f5b6af28a8be30030de5f2c1b05d07997d6 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 11:03:53 +0200 Subject: [PATCH 03/16] license correction: FreeBSD --> BSD-2-Clause-FreeBSD #234 --- metadata/br.odb.knights.txt | 2 +- metadata/click.dummer.rickapp.txt | 2 +- metadata/click.dummer.textthing.txt | 2 +- metadata/com.actisec.clipcaster.txt | 2 +- metadata/com.alexxz.hawkingquotes.txt | 2 +- metadata/com.blogspot.tonyatkins.freespeech.txt | 2 +- metadata/com.ds.avare.txt | 2 +- metadata/com.fivasim.antikythera.txt | 2 +- metadata/com.jorgecastillo.kanadrill.txt | 2 +- metadata/com.samwhited.opensharelocationplugin.txt | 2 +- metadata/com.zachrattner.pockettalk.txt | 2 +- metadata/edu.cmu.pocketsphinx.demo.txt | 2 +- metadata/free.yhc.feeder.txt | 2 +- metadata/org.bobstuff.bobball.txt | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/metadata/br.odb.knights.txt b/metadata/br.odb.knights.txt index 0c070dd52a..436dc7cdfa 100644 --- a/metadata/br.odb.knights.txt +++ b/metadata/br.odb.knights.txt @@ -1,5 +1,5 @@ Categories:Games -License:FreeBSD +License:BSD-2-Clause-FreeBSD Web Site:https://github.com/TheFakeMontyOnTheRun/knightsofalentejo/blob/HEAD/README.md Source Code:https://github.com/TheFakeMontyOnTheRun/knightsofalentejo Issue Tracker:https://github.com/TheFakeMontyOnTheRun/knightsofalentejo/issues diff --git a/metadata/click.dummer.rickapp.txt b/metadata/click.dummer.rickapp.txt index 96a11e995f..682b89a1aa 100644 --- a/metadata/click.dummer.rickapp.txt +++ b/metadata/click.dummer.rickapp.txt @@ -1,5 +1,5 @@ Categories:Games,Multimedia -License:FreeBSD +License:BSD-2-Clause-FreeBSD Author Name:deadlockz Web Site:https://no-go.github.io/RickApp/ Source Code:https://github.com/no-go/RickApp diff --git a/metadata/click.dummer.textthing.txt b/metadata/click.dummer.textthing.txt index 5e8dc2119d..6d9ca9fec1 100644 --- a/metadata/click.dummer.textthing.txt +++ b/metadata/click.dummer.textthing.txt @@ -1,5 +1,5 @@ Categories:Development,Writing -License:FreeBSD +License:BSD-2-Clause-FreeBSD Author Name:deadlockz Web Site:http://dummer.click Source Code:https://github.com/no-go/TextThing diff --git a/metadata/com.actisec.clipcaster.txt b/metadata/com.actisec.clipcaster.txt index e9ce4f4be2..4da71ce898 100644 --- a/metadata/com.actisec.clipcaster.txt +++ b/metadata/com.actisec.clipcaster.txt @@ -1,5 +1,5 @@ Categories:Security -License:FreeBSD +License:BSD-2-Clause-FreeBSD Web Site:https://github.com/activems/clipcaster/blob/HEAD/README.md Source Code:https://github.com/activems/clipcaster Issue Tracker:https://github.com/activems/clipcaster/issues diff --git a/metadata/com.alexxz.hawkingquotes.txt b/metadata/com.alexxz.hawkingquotes.txt index 197d0af601..61c6467746 100644 --- a/metadata/com.alexxz.hawkingquotes.txt +++ b/metadata/com.alexxz.hawkingquotes.txt @@ -1,5 +1,5 @@ Categories:Reading -License:FreeBSD +License:BSD-2-Clause-FreeBSD Web Site: Source Code:https://github.com/Alexxz/Hawkingquotes Issue Tracker:https://github.com/Alexxz/Hawkingquotes/issues diff --git a/metadata/com.blogspot.tonyatkins.freespeech.txt b/metadata/com.blogspot.tonyatkins.freespeech.txt index f38ffcf490..193de57498 100644 --- a/metadata/com.blogspot.tonyatkins.freespeech.txt +++ b/metadata/com.blogspot.tonyatkins.freespeech.txt @@ -1,5 +1,5 @@ Categories:Science & Education -License:FreeBSD +License:BSD-2-Clause-FreeBSD Web Site: Source Code:https://bitbucket.org/duhrer/free-speech-for-android Issue Tracker: diff --git a/metadata/com.ds.avare.txt b/metadata/com.ds.avare.txt index 9a751a97ad..ebdc3b747b 100644 --- a/metadata/com.ds.avare.txt +++ b/metadata/com.ds.avare.txt @@ -1,6 +1,6 @@ AntiFeatures:UpstreamNonFree,NonFreeDep Categories:Navigation -License:FreeBSD +License:BSD-2-Clause-FreeBSD Web Site:http://apps4av.com/avare-overview Source Code:https://github.com/apps4av/avare Issue Tracker:https://github.com/apps4av/avare/issues diff --git a/metadata/com.fivasim.antikythera.txt b/metadata/com.fivasim.antikythera.txt index 3a3eedbb09..c0198af761 100644 --- a/metadata/com.fivasim.antikythera.txt +++ b/metadata/com.fivasim.antikythera.txt @@ -1,5 +1,5 @@ Categories:Science & Education -License:FreeBSD +License:BSD-2-Clause-FreeBSD Web Site: Source Code:https://github.com/fivasim/Antikythera-Simulation Issue Tracker:https://github.com/fivasim/Antikythera-Simulation/issues diff --git a/metadata/com.jorgecastillo.kanadrill.txt b/metadata/com.jorgecastillo.kanadrill.txt index 7155a81471..d039478169 100644 --- a/metadata/com.jorgecastillo.kanadrill.txt +++ b/metadata/com.jorgecastillo.kanadrill.txt @@ -1,5 +1,5 @@ Categories:Reading -License:FreeBSD +License:BSD-2-Clause-FreeBSD Web Site: Source Code:https://github.com/jorgecastillo/KanaDrill Issue Tracker:https://github.com/jorgecastillo/KanaDrill/issues diff --git a/metadata/com.samwhited.opensharelocationplugin.txt b/metadata/com.samwhited.opensharelocationplugin.txt index 9cd7186868..f925cb9922 100644 --- a/metadata/com.samwhited.opensharelocationplugin.txt +++ b/metadata/com.samwhited.opensharelocationplugin.txt @@ -1,5 +1,5 @@ Categories:Internet -License:FreeBSD +License:BSD-2-Clause-FreeBSD Author Name:Sam Whited Web Site: Source Code:https://bitbucket.org/SamWhited/opensharelocationplugin diff --git a/metadata/com.zachrattner.pockettalk.txt b/metadata/com.zachrattner.pockettalk.txt index 783ca5903f..6c30fb08cc 100644 --- a/metadata/com.zachrattner.pockettalk.txt +++ b/metadata/com.zachrattner.pockettalk.txt @@ -1,5 +1,5 @@ Categories:Phone & SMS -License:FreeBSD +License:BSD-2-Clause-FreeBSD Web Site:http://www.zachrattner.com Source Code:https://github.com/zachrattner/pockettalk Issue Tracker:https://github.com/zachrattner/pockettalk/issues diff --git a/metadata/edu.cmu.pocketsphinx.demo.txt b/metadata/edu.cmu.pocketsphinx.demo.txt index 653f4e7603..4955c82f7c 100644 --- a/metadata/edu.cmu.pocketsphinx.demo.txt +++ b/metadata/edu.cmu.pocketsphinx.demo.txt @@ -1,5 +1,5 @@ Categories:Multimedia -License:FreeBSD +License:BSD-2-Clause-FreeBSD Web Site:http://cmusphinx.sourceforge.net Source Code:https://github.com/cmusphinx/pocketsphinx-android-demo Issue Tracker:https://github.com/cmusphinx/pocketsphinx-android-demo/issues diff --git a/metadata/free.yhc.feeder.txt b/metadata/free.yhc.feeder.txt index 5b65393f51..04b4814147 100644 --- a/metadata/free.yhc.feeder.txt +++ b/metadata/free.yhc.feeder.txt @@ -1,5 +1,5 @@ Categories:Reading,Internet -License:FreeBSD +License:BSD-2-Clause-FreeBSD Web Site: Source Code:https://github.com/yhcting/feedhive Issue Tracker:https://github.com/yhcting/feedhive/issues diff --git a/metadata/org.bobstuff.bobball.txt b/metadata/org.bobstuff.bobball.txt index 6c42f7160f..1be47ce460 100644 --- a/metadata/org.bobstuff.bobball.txt +++ b/metadata/org.bobstuff.bobball.txt @@ -1,5 +1,5 @@ Categories:Games -License:FreeBSD +License:BSD-2-Clause-FreeBSD Web Site:https://github.com/bobthekingofegypt/BobBall/blob/HEAD/README.mkd Source Code:https://github.com/bobthekingofegypt/BobBall Issue Tracker:https://github.com/bobthekingofegypt/BobBall/issues From 9007fa35fc4cc9c54329de38f89a18fd3526adcf Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 11:11:12 +0200 Subject: [PATCH 04/16] license correction: NewBSD --> BSD-3-Clause I did a manual audit to see if the licenses match this: https://spdx.org/licenses/BSD-3-Clause.html for f in `grep '^License:' metadata/*.txt|grep NewBSD| cut -d : -f 1|sort -u | sed 's,\.txt,,'|cut -d / -f 2`; do find build/$f/ -iname '*license*' -o -iname 'COPYING*' | xargs less; done #234 --- metadata/at.huber.sampleDownload.txt | 2 +- metadata/cc.rainwave.android.txt | 2 +- metadata/click.dummer.UartSmartwatch.txt | 2 +- metadata/com.MarcosDiez.shareviahttp.txt | 2 +- metadata/com.axelby.podax.txt | 2 +- metadata/com.digitallizard.nicecompass.txt | 2 +- metadata/com.futonredemption.mylocation.txt | 2 +- metadata/com.futurice.android.reservator.txt | 2 +- metadata/com.github.nutomic.controldlna.txt | 2 +- metadata/com.jaygoel.virginminuteschecker.txt | 2 +- metadata/com.kibab.android.EncPassChanger.txt | 2 +- metadata/com.lecz.android.tiltmazes.txt | 2 +- metadata/com.naholyr.android.horairessncf.txt | 2 +- metadata/com.nilhcem.frcndict.txt | 2 +- metadata/com.sensirion.smartgadget.txt | 2 +- metadata/com.smerty.ham.txt | 2 +- metadata/com.uploadedlobster.PwdHash.txt | 2 +- metadata/com.yubico.yubiclip.txt | 2 +- metadata/com.yubico.yubioath.txt | 2 +- metadata/com.yubico.yubitotp.txt | 2 +- metadata/de.enaikoon.android.keypadmapper3.txt | 2 +- metadata/de.tum.in.tumcampus.txt | 2 +- metadata/io.gitlab.mudassir.youtubecacher.txt | 2 +- metadata/kmac.dejavu_fonts.txt | 2 +- metadata/mobi.omegacentauri.PerApp.txt | 2 +- metadata/net.exclaimindustries.geohashdroid.txt | 2 +- metadata/net.mafro.android.wakeonlan.txt | 2 +- metadata/net.pherth.omnomagon.txt | 2 +- metadata/net.progval.android.andquote.txt | 2 +- metadata/net.somethingdreadful.MAL.txt | 2 +- metadata/net.thauvin.erik.android.noussd.txt | 2 +- metadata/org.ciasaboark.tacere.txt | 2 +- metadata/org.daylightingsociety.wherearetheeyes.txt | 2 +- metadata/org.dyndns.fules.ck.txt | 2 +- metadata/org.smerty.zooborns.txt | 2 +- metadata/org.tmurakam.presentationtimer.txt | 2 +- metadata/org.torproject.android.txt | 2 +- metadata/ru.ttyh.neko259.notey.txt | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/metadata/at.huber.sampleDownload.txt b/metadata/at.huber.sampleDownload.txt index 86076620c7..b7c008bc74 100644 --- a/metadata/at.huber.sampleDownload.txt +++ b/metadata/at.huber.sampleDownload.txt @@ -1,5 +1,5 @@ Categories:Internet -License:NewBSD +License:BSD-3-Clause Web Site:https://github.com/HaarigerHarald/android-youtubeExtractor/blob/HEAD/README.md Source Code:https://github.com/HaarigerHarald/android-youtubeExtractor Issue Tracker:https://github.com/HaarigerHarald/android-youtubeExtractor/issues diff --git a/metadata/cc.rainwave.android.txt b/metadata/cc.rainwave.android.txt index 56fb635feb..0e06a14404 100644 --- a/metadata/cc.rainwave.android.txt +++ b/metadata/cc.rainwave.android.txt @@ -1,5 +1,5 @@ Categories:Multimedia -License:NewBSD +License:BSD-3-Clause Web Site:http://rainwave.cc Source Code:https://github.com/OEP/rainwave-android Issue Tracker:https://github.com/OEP/rainwave-android/issues diff --git a/metadata/click.dummer.UartSmartwatch.txt b/metadata/click.dummer.UartSmartwatch.txt index 0b65411276..609c7e3513 100644 --- a/metadata/click.dummer.UartSmartwatch.txt +++ b/metadata/click.dummer.UartSmartwatch.txt @@ -1,5 +1,5 @@ Categories:Connectivity,Development -License:NewBSD +License:BSD-3-Clause Author Name:deadlockz Web Site:https://github.com/no-go/UART-Smartwatch/blob/HEAD/README.md Source Code:https://github.com/no-go/UART-Smartwatch diff --git a/metadata/com.MarcosDiez.shareviahttp.txt b/metadata/com.MarcosDiez.shareviahttp.txt index 32d06c87ec..f653bfcff8 100644 --- a/metadata/com.MarcosDiez.shareviahttp.txt +++ b/metadata/com.MarcosDiez.shareviahttp.txt @@ -1,5 +1,5 @@ Categories:Internet -License:NewBSD +License:BSD-3-Clause Web Site:https://github.com/marcosdiez/shareviahttp/blob/HEAD/README.md Source Code:https://github.com/marcosdiez/shareviahttp Issue Tracker:https://github.com/marcosdiez/shareviahttp/issues diff --git a/metadata/com.axelby.podax.txt b/metadata/com.axelby.podax.txt index 3dad0c3421..34969b026e 100644 --- a/metadata/com.axelby.podax.txt +++ b/metadata/com.axelby.podax.txt @@ -1,5 +1,5 @@ Categories:Multimedia -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/thasmin/Podax Issue Tracker:https://github.com/thasmin/Podax/issues diff --git a/metadata/com.digitallizard.nicecompass.txt b/metadata/com.digitallizard.nicecompass.txt index 4e013ee037..7471205bc9 100644 --- a/metadata/com.digitallizard.nicecompass.txt +++ b/metadata/com.digitallizard.nicecompass.txt @@ -1,5 +1,5 @@ Categories:Navigation -License:NewBSD +License:BSD-3-Clause Web Site:https://market.android.com/details?id=com.digitallizard.nicecompass Source Code:https://github.com/okey666/NiceCompass Issue Tracker:https://github.com/okey666/NiceCompass/issues diff --git a/metadata/com.futonredemption.mylocation.txt b/metadata/com.futonredemption.mylocation.txt index db9cc4d28d..82de2454e7 100644 --- a/metadata/com.futonredemption.mylocation.txt +++ b/metadata/com.futonredemption.mylocation.txt @@ -1,5 +1,5 @@ Categories:Navigation -License:NewBSD +License:BSD-3-Clause Web Site:https://code.google.com/p/futonic-mylocationwidget Source Code:https://code.google.com/p/futonic-mylocationwidget/source Issue Tracker: diff --git a/metadata/com.futurice.android.reservator.txt b/metadata/com.futurice.android.reservator.txt index c9cb2df806..cbb35675fe 100644 --- a/metadata/com.futurice.android.reservator.txt +++ b/metadata/com.futurice.android.reservator.txt @@ -1,6 +1,6 @@ AntiFeatures:NonFreeNet Categories:Time -License:NewBSD +License:BSD-3-Clause Web Site:https://github.com/futurice/meeting-room-tablet/blob/HEAD/README.md Source Code:https://github.com/futurice/meeting-room-tablet Issue Tracker:https://github.com/futurice/meeting-room-tablet/issues diff --git a/metadata/com.github.nutomic.controldlna.txt b/metadata/com.github.nutomic.controldlna.txt index a892c7b31c..2782af1aff 100644 --- a/metadata/com.github.nutomic.controldlna.txt +++ b/metadata/com.github.nutomic.controldlna.txt @@ -1,5 +1,5 @@ Categories:Multimedia -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/Nutomic/control-dlna Issue Tracker:https://github.com/Nutomic/control-dlna/issues diff --git a/metadata/com.jaygoel.virginminuteschecker.txt b/metadata/com.jaygoel.virginminuteschecker.txt index a61910c722..1d2c463277 100644 --- a/metadata/com.jaygoel.virginminuteschecker.txt +++ b/metadata/com.jaygoel.virginminuteschecker.txt @@ -1,6 +1,6 @@ AntiFeatures:UpstreamNonFree Categories:System -License:NewBSD +License:BSD-3-Clause Web Site:http://www.jaygoel.com Source Code:https://github.com/poundifdef/VirginMobileMinutesChecker Issue Tracker:https://github.com/poundifdef/VirginMobileMinutesChecker/issues diff --git a/metadata/com.kibab.android.EncPassChanger.txt b/metadata/com.kibab.android.EncPassChanger.txt index 5ef968a517..da0f7bca01 100644 --- a/metadata/com.kibab.android.EncPassChanger.txt +++ b/metadata/com.kibab.android.EncPassChanger.txt @@ -1,5 +1,5 @@ Categories:Security -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/kibab/encpasschanger Issue Tracker:https://github.com/kibab/encpasschanger/issues diff --git a/metadata/com.lecz.android.tiltmazes.txt b/metadata/com.lecz.android.tiltmazes.txt index 645881cd62..afdb272f68 100644 --- a/metadata/com.lecz.android.tiltmazes.txt +++ b/metadata/com.lecz.android.tiltmazes.txt @@ -1,5 +1,5 @@ Categories:Games -License:NewBSD +License:BSD-3-Clause Web Site:https://code.google.com/p/tiltmazes Source Code:https://code.google.com/p/tiltmazes/source Issue Tracker: diff --git a/metadata/com.naholyr.android.horairessncf.txt b/metadata/com.naholyr.android.horairessncf.txt index 1760a3c05e..866c75d085 100644 --- a/metadata/com.naholyr.android.horairessncf.txt +++ b/metadata/com.naholyr.android.horairessncf.txt @@ -1,5 +1,5 @@ Categories:Navigation -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/naholyr/horaires-ter-sncf Issue Tracker:https://github.com/naholyr/horaires-ter-sncf/issues diff --git a/metadata/com.nilhcem.frcndict.txt b/metadata/com.nilhcem.frcndict.txt index 429038706f..0ecaa72810 100644 --- a/metadata/com.nilhcem.frcndict.txt +++ b/metadata/com.nilhcem.frcndict.txt @@ -1,5 +1,5 @@ Categories:Reading -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/Nilhcem/frcndict-android Issue Tracker:https://github.com/Nilhcem/frcndict-android/issues diff --git a/metadata/com.sensirion.smartgadget.txt b/metadata/com.sensirion.smartgadget.txt index 8867126e29..d0173d59d1 100644 --- a/metadata/com.sensirion.smartgadget.txt +++ b/metadata/com.sensirion.smartgadget.txt @@ -1,5 +1,5 @@ Categories:Connectivity,Science & Education -License:NewBSD +License:BSD-3-Clause Web Site:https://www.sensirion.com/en/products/humidity-sensors/development-kit/smart-gadget-app-for-android/ Source Code:https://github.com/Sensirion/SmartGadget-Android Issue Tracker:https://github.com/Sensirion/SmartGadget-Android/issues diff --git a/metadata/com.smerty.ham.txt b/metadata/com.smerty.ham.txt index afcf281234..187172587b 100644 --- a/metadata/com.smerty.ham.txt +++ b/metadata/com.smerty.ham.txt @@ -1,5 +1,5 @@ Categories:Science & Education -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/Smerty/ham.android Issue Tracker:https://github.com/Smerty/ham.android/issues diff --git a/metadata/com.uploadedlobster.PwdHash.txt b/metadata/com.uploadedlobster.PwdHash.txt index 184d197faa..41991853ce 100644 --- a/metadata/com.uploadedlobster.PwdHash.txt +++ b/metadata/com.uploadedlobster.PwdHash.txt @@ -1,5 +1,5 @@ Categories:Internet -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/phw/Android-PwdHash Issue Tracker:https://github.com/phw/Android-PwdHash/issues diff --git a/metadata/com.yubico.yubiclip.txt b/metadata/com.yubico.yubiclip.txt index d9203ebe89..3cc5c35c95 100644 --- a/metadata/com.yubico.yubiclip.txt +++ b/metadata/com.yubico.yubiclip.txt @@ -1,5 +1,5 @@ Categories:Connectivity -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/Yubico/yubiclip-android Issue Tracker:https://github.com/Yubico/yubiclip-android/issues diff --git a/metadata/com.yubico.yubioath.txt b/metadata/com.yubico.yubioath.txt index dbbadbbe0c..f5cbed6495 100644 --- a/metadata/com.yubico.yubioath.txt +++ b/metadata/com.yubico.yubioath.txt @@ -1,5 +1,5 @@ Categories:Connectivity -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/Yubico/yubioath-android Issue Tracker:https://github.com/Yubico/yubioath-android/issues diff --git a/metadata/com.yubico.yubitotp.txt b/metadata/com.yubico.yubitotp.txt index 44e55a43d9..9acbea41b6 100644 --- a/metadata/com.yubico.yubitotp.txt +++ b/metadata/com.yubico.yubitotp.txt @@ -1,5 +1,5 @@ Categories:Connectivity -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/Yubico/yubitotp-android Issue Tracker:https://github.com/Yubico/yubitotp-android/issues diff --git a/metadata/de.enaikoon.android.keypadmapper3.txt b/metadata/de.enaikoon.android.keypadmapper3.txt index 9abaa88c90..e17248fca8 100644 --- a/metadata/de.enaikoon.android.keypadmapper3.txt +++ b/metadata/de.enaikoon.android.keypadmapper3.txt @@ -1,6 +1,6 @@ AntiFeatures:Tracking Categories:Navigation -License:NewBSD +License:BSD-3-Clause Web Site:http://wiki.openstreetmap.org/wiki/Keypad-Mapper_3 Source Code:https://github.com/msemm/Keypad-Mapper-3 Issue Tracker:https://github.com/msemm/Keypad-Mapper-3/issues diff --git a/metadata/de.tum.in.tumcampus.txt b/metadata/de.tum.in.tumcampus.txt index 8133d3a8e7..699aef49b8 100644 --- a/metadata/de.tum.in.tumcampus.txt +++ b/metadata/de.tum.in.tumcampus.txt @@ -1,5 +1,5 @@ Categories:Internet -License:GPL-3.0,NewBSD +License:GPL-3.0 Web Site:https://apps.wiki.tum.de/TUM+Campus+App Source Code:https://github.com/TCA-Team/TumCampusApp Issue Tracker:https://github.com/TCA-Team/TumCampusApp/issues diff --git a/metadata/io.gitlab.mudassir.youtubecacher.txt b/metadata/io.gitlab.mudassir.youtubecacher.txt index dbee14bee9..18fae1bff8 100644 --- a/metadata/io.gitlab.mudassir.youtubecacher.txt +++ b/metadata/io.gitlab.mudassir.youtubecacher.txt @@ -1,6 +1,6 @@ AntiFeatures:NonFreeNet Categories:Multimedia -License:NewBSD +License:BSD-3-Clause Web Site:https://gitlab.com/mudassir/youtube-cacher Source Code:https://gitlab.com/mudassir/youtube-cacher/tree/HEAD Issue Tracker:https://gitlab.com/mudassir/youtube-cacher/issues diff --git a/metadata/kmac.dejavu_fonts.txt b/metadata/kmac.dejavu_fonts.txt index e58a541419..2ea2e9ff52 100644 --- a/metadata/kmac.dejavu_fonts.txt +++ b/metadata/kmac.dejavu_fonts.txt @@ -1,5 +1,5 @@ Categories:Theming -License:NewBSD +License:BSD-3-Clause Web Site:https://gitlab.com/kmacdeV/cm-dejavu-fonts Source Code:https://gitlab.com/kmacdeV/cm-dejavu-fonts/tree/HEAD Issue Tracker:https://gitlab.com/kmacdeV/cm-dejavu-fonts/issues diff --git a/metadata/mobi.omegacentauri.PerApp.txt b/metadata/mobi.omegacentauri.PerApp.txt index 26f0f67a2d..e663e94745 100644 --- a/metadata/mobi.omegacentauri.PerApp.txt +++ b/metadata/mobi.omegacentauri.PerApp.txt @@ -1,5 +1,5 @@ Categories:System -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/arpruss/perapp Issue Tracker:https://github.com/arpruss/perapp/issues diff --git a/metadata/net.exclaimindustries.geohashdroid.txt b/metadata/net.exclaimindustries.geohashdroid.txt index 7c28563c36..71d89c00d0 100644 --- a/metadata/net.exclaimindustries.geohashdroid.txt +++ b/metadata/net.exclaimindustries.geohashdroid.txt @@ -1,7 +1,7 @@ Disabled:Non-free dependency AntiFeatures:UpstreamNonFree Categories:Navigation -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/CaptainSpam/geohashdroid Issue Tracker:https://github.com/CaptainSpam/geohashdroid/issues diff --git a/metadata/net.mafro.android.wakeonlan.txt b/metadata/net.mafro.android.wakeonlan.txt index 1e0fbaf766..d6d227fc66 100644 --- a/metadata/net.mafro.android.wakeonlan.txt +++ b/metadata/net.mafro.android.wakeonlan.txt @@ -1,5 +1,5 @@ Categories:Connectivity -License:NewBSD +License:BSD-3-Clause Web Site:http://android.mafro.net/wol_tutorial.htm Source Code:https://github.com/mafrosis/Wake-On-Lan Issue Tracker:https://github.com/mafrosis/Wake-On-Lan/issues diff --git a/metadata/net.pherth.omnomagon.txt b/metadata/net.pherth.omnomagon.txt index 510539c916..3a9328bc02 100644 --- a/metadata/net.pherth.omnomagon.txt +++ b/metadata/net.pherth.omnomagon.txt @@ -1,5 +1,5 @@ Categories:Reading -License:NewBSD +License:BSD-3-Clause Web Site:https://viirus.github.io/Omnomagon Source Code:https://github.com/vIiRuS/Omnomagon Issue Tracker:https://github.com/vIiRuS/Omnomagon/issues diff --git a/metadata/net.progval.android.andquote.txt b/metadata/net.progval.android.andquote.txt index 70984435dc..0593caf727 100644 --- a/metadata/net.progval.android.andquote.txt +++ b/metadata/net.progval.android.andquote.txt @@ -1,5 +1,5 @@ Categories:Reading -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/ProgVal/AndQuote Issue Tracker:https://github.com/ProgVal/AndQuote/issues diff --git a/metadata/net.somethingdreadful.MAL.txt b/metadata/net.somethingdreadful.MAL.txt index 635eeea2ea..8d5956af18 100644 --- a/metadata/net.somethingdreadful.MAL.txt +++ b/metadata/net.somethingdreadful.MAL.txt @@ -1,5 +1,5 @@ Categories:Reading -License:NewBSD +License:BSD-3-Clause Web Site:https://atarashiiapp.com Source Code:https://github.com/AnimeNeko/Atarashii Issue Tracker:https://github.com/AnimeNeko/Atarashii/issues diff --git a/metadata/net.thauvin.erik.android.noussd.txt b/metadata/net.thauvin.erik.android.noussd.txt index 9ca6787333..b5d66d0d56 100644 --- a/metadata/net.thauvin.erik.android.noussd.txt +++ b/metadata/net.thauvin.erik.android.noussd.txt @@ -1,5 +1,5 @@ Categories:Security -License:NewBSD +License:BSD-3-Clause Web Site:http://mobile.thauvin.net/android/#noussd Source Code:https://github.com/ethauvin/NoUSSD Issue Tracker:https://github.com/ethauvin/NoUSSD/issues diff --git a/metadata/org.ciasaboark.tacere.txt b/metadata/org.ciasaboark.tacere.txt index 9c3ea8cf35..19ec35ab24 100644 --- a/metadata/org.ciasaboark.tacere.txt +++ b/metadata/org.ciasaboark.tacere.txt @@ -1,5 +1,5 @@ Categories:Time -License:NewBSD +License:BSD-3-Clause Web Site:https://github.com/ciasaboark/Tacere/blob/HEAD/README.md Source Code:https://github.com/ciasaboark/Tacere Issue Tracker:https://github.com/ciasaboark/Tacere/issues diff --git a/metadata/org.daylightingsociety.wherearetheeyes.txt b/metadata/org.daylightingsociety.wherearetheeyes.txt index d238622ee9..505eced400 100644 --- a/metadata/org.daylightingsociety.wherearetheeyes.txt +++ b/metadata/org.daylightingsociety.wherearetheeyes.txt @@ -1,5 +1,5 @@ Categories:Security,Navigation -License:NewBSD +License:BSD-3-Clause Author Name:Daylighting Society Author Email:eyes@daylightingsociety.org Web Site:https://eyes.daylightingsociety.org diff --git a/metadata/org.dyndns.fules.ck.txt b/metadata/org.dyndns.fules.ck.txt index eb86313055..8579d86f24 100644 --- a/metadata/org.dyndns.fules.ck.txt +++ b/metadata/org.dyndns.fules.ck.txt @@ -1,5 +1,5 @@ Categories:Writing -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/gsimon75/compass-keyboard Issue Tracker:https://github.com/gsimon75/compass-keyboard/issues diff --git a/metadata/org.smerty.zooborns.txt b/metadata/org.smerty.zooborns.txt index 2011467985..ddb87512c8 100644 --- a/metadata/org.smerty.zooborns.txt +++ b/metadata/org.smerty.zooborns.txt @@ -1,5 +1,5 @@ Categories:Multimedia -License:NewBSD +License:BSD-3-Clause Web Site: Source Code:https://github.com/Smerty/zooborns.android Issue Tracker: diff --git a/metadata/org.tmurakam.presentationtimer.txt b/metadata/org.tmurakam.presentationtimer.txt index fb801a1a4c..d16bee7ef3 100644 --- a/metadata/org.tmurakam.presentationtimer.txt +++ b/metadata/org.tmurakam.presentationtimer.txt @@ -1,5 +1,5 @@ Categories:Time -License:NewBSD +License:BSD-3-Clause Web Site:http://apps.tmurakam.org Source Code:https://github.com/Plux7MMxGiLYmoJY/presentationtimer-android Issue Tracker:https://github.com/Plux7MMxGiLYmoJY/presentationtimer-android/issues diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt index 7672cc64af..001ce24026 100644 --- a/metadata/org.torproject.android.txt +++ b/metadata/org.torproject.android.txt @@ -1,5 +1,5 @@ Categories:Security,Internet -License:NewBSD +License:BSD-3-Clause Web Site:http://www.torproject.org/docs/android.html.en Source Code:https://gitweb.torproject.org/orbot.git Issue Tracker:https://dev.guardianproject.info/projects/orbot/issues diff --git a/metadata/ru.ttyh.neko259.notey.txt b/metadata/ru.ttyh.neko259.notey.txt index a3b9e1830c..c172c88289 100644 --- a/metadata/ru.ttyh.neko259.notey.txt +++ b/metadata/ru.ttyh.neko259.notey.txt @@ -1,5 +1,5 @@ Categories:Writing -License:NewBSD +License:BSD-3-Clause Web Site:https://bitbucket.org/neko259/notey Source Code:https://bitbucket.org/neko259/notey/src Issue Tracker: From 66e6feb99564517d7577d12f89b7a5bef4c86d31 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 11:19:25 +0200 Subject: [PATCH 05/16] CC-licensed NonFreeAssets means that's the license of the app In the case of a permissive license on the source code and CC-BY-NC assets, the app should be labeled CC-BY-NC. The whole app cannot be used under the BSD, but BSD/etc code can be included in CC-BY-NC. #234 --- metadata/com.powerje.nyan.txt | 5 +++-- metadata/com.rj.pixelesque.txt | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/metadata/com.powerje.nyan.txt b/metadata/com.powerje.nyan.txt index f8845c7d6b..5c035d386b 100644 --- a/metadata/com.powerje.nyan.txt +++ b/metadata/com.powerje.nyan.txt @@ -1,6 +1,6 @@ AntiFeatures:NonFreeAssets Categories:Theming -License:Apache-2.0 +License:CC-BY-NC-3.0 Web Site: Source Code:https://github.com/powerje/NyanDroid Issue Tracker:https://github.com/powerje/NyanDroid/issues @@ -11,7 +11,8 @@ Description: Endless, flying-pop-tart-cat-alike wallpaper, with options and a standalone, musical, launcher version. -The music is licensed under CC-BY-SA-NC3.0. +The music is licensed under CC-BY-NC-3.0. The source code is licensed under the +Apache-2.0 license. . Repo Type:git diff --git a/metadata/com.rj.pixelesque.txt b/metadata/com.rj.pixelesque.txt index 27b480fed5..1d53739699 100644 --- a/metadata/com.rj.pixelesque.txt +++ b/metadata/com.rj.pixelesque.txt @@ -1,6 +1,6 @@ AntiFeatures:NonFreeAssets Categories:Graphics -License:NewBSD +License:CC-BY-NC-3.0 Web Site: Source Code:https://github.com/rjmarsan/Pixelesque Issue Tracker:https://github.com/rjmarsan/Pixelesque/issues @@ -14,7 +14,7 @@ zoom anywhere to navigate large images. There’s a full undo/redo stack, as wel as a color picker with history, hsv, rgb, and hex! The canvas can be resized when a new canvas is chosen. The artwork is licensed -under CC-BY-SA-NC while the app is under NewBSD license. +under CC-BY-NC while the source code is under BSD-3-Clause license. . Repo Type:git From b4185a088d1d223472bd9ca18b6324e459515762 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 11:30:13 +0200 Subject: [PATCH 06/16] license correction: BSD --> BSD-3-Clause https://spdx.org/licenses/BSD-3-Clause.html Manually inspected the license: grep '^License:' metadata/*.txt|grep BSD|grep -v BSD- #234 --- metadata/cat.mvmike.minimalcalendarwidget.txt | 2 +- metadata/com.chmod0.manpages.txt | 2 +- metadata/com.tinkerlog.android.pongtime.txt | 2 +- metadata/net.wigle.wigleandroid.txt | 2 +- metadata/org.diygenomics.pg.txt | 2 +- metadata/org.jf.Penroser.txt | 2 +- metadata/org.redcross.openmapkit.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/metadata/cat.mvmike.minimalcalendarwidget.txt b/metadata/cat.mvmike.minimalcalendarwidget.txt index 4f929e5b1f..11a32b20e3 100644 --- a/metadata/cat.mvmike.minimalcalendarwidget.txt +++ b/metadata/cat.mvmike.minimalcalendarwidget.txt @@ -1,5 +1,5 @@ Categories:Theming,Time -License:BSD-3 +License:BSD-3-Clause Web Site: Source Code:https://github.com/mvmike/min-cal-widget Issue Tracker:https://github.com/mvmike/min-cal-widget/issues diff --git a/metadata/com.chmod0.manpages.txt b/metadata/com.chmod0.manpages.txt index 6d5305f3c3..567956a062 100644 --- a/metadata/com.chmod0.manpages.txt +++ b/metadata/com.chmod0.manpages.txt @@ -1,5 +1,5 @@ Categories:Reading -License:BSD +License:BSD-3-Clause Web Site:http://julien.guepin.fr Source Code:https://github.com/chmod0/Manpages Issue Tracker:https://github.com/jguepin/Manpages/issues diff --git a/metadata/com.tinkerlog.android.pongtime.txt b/metadata/com.tinkerlog.android.pongtime.txt index c76d221375..edbda1cc2d 100644 --- a/metadata/com.tinkerlog.android.pongtime.txt +++ b/metadata/com.tinkerlog.android.pongtime.txt @@ -1,5 +1,5 @@ Categories:Time -License:BSD +License:BSD-3-Clause Web Site:http://tinkerlog.com/2010/03/20/pong-time Source Code:https://github.com/tinkerlog/PongTime Issue Tracker:https://github.com/tinkerlog/PongTime/issues diff --git a/metadata/net.wigle.wigleandroid.txt b/metadata/net.wigle.wigleandroid.txt index b4be6bcbdf..90c55f1fb3 100644 --- a/metadata/net.wigle.wigleandroid.txt +++ b/metadata/net.wigle.wigleandroid.txt @@ -1,6 +1,6 @@ AntiFeatures:NonFreeNet Categories:Connectivity -License:BSD +License:BSD-3-Clause Web Site:http://wigle.net Source Code:https://github.com/wiglenet/wigle-wifi-wardriving Issue Tracker:https://github.com/wiglenet/wigle-wifi-wardriving/issues diff --git a/metadata/org.diygenomics.pg.txt b/metadata/org.diygenomics.pg.txt index 5cdb6ce035..1c7e580a95 100644 --- a/metadata/org.diygenomics.pg.txt +++ b/metadata/org.diygenomics.pg.txt @@ -1,5 +1,5 @@ Categories:Science & Education -License:BSD +License:BSD-3-Clause Web Site:http://diygenomics.org Source Code:https://github.com/lablogga/DIYgenomics_Android Issue Tracker:https://github.com/lablogga/DIYgenomics_Android/issues diff --git a/metadata/org.jf.Penroser.txt b/metadata/org.jf.Penroser.txt index 89944b0dd3..12bc913a21 100644 --- a/metadata/org.jf.Penroser.txt +++ b/metadata/org.jf.Penroser.txt @@ -1,5 +1,5 @@ Categories:Theming -License:BSD,Apache2 +License:BSD-3-Clause Web Site: Source Code:https://github.com/JesusFreke/Penroser Issue Tracker:https://github.com/JesusFreke/Penroser/issues diff --git a/metadata/org.redcross.openmapkit.txt b/metadata/org.redcross.openmapkit.txt index 32e751ee72..515a32364b 100644 --- a/metadata/org.redcross.openmapkit.txt +++ b/metadata/org.redcross.openmapkit.txt @@ -1,5 +1,5 @@ Categories:Navigation -License:BSD +License:BSD-3-Clause Web Site:http://openmapkit.org/ Source Code:https://github.com/AmericanRedCross/OpenMapKitAndroid Issue Tracker:https://github.com/AmericanRedCross/OpenMapKitAndroid/issues From 5cdebdaa24bfa325d03057700186db6cafc1534d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 11:30:29 +0200 Subject: [PATCH 07/16] license correction: BSD --> BSD-2-Clause https://spdx.org/licenses/BSD-3-Clause.html Manually inspected the license: grep '^License:' metadata/*.txt|grep BSD|grep -v BSD- #234 --- metadata/org.openobservatory.ooniprobe.txt | 2 +- metadata/uk.co.keepawayfromfire.screens.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/org.openobservatory.ooniprobe.txt b/metadata/org.openobservatory.ooniprobe.txt index d2ee9005d8..38c03af029 100644 --- a/metadata/org.openobservatory.ooniprobe.txt +++ b/metadata/org.openobservatory.ooniprobe.txt @@ -1,5 +1,5 @@ Categories:Internet,Security -License:BSD +License:BSD-2-Clause Web Site:https://ooni.torproject.org/ Source Code:https://github.com/TheTorProject/ooniprobe-android Issue Tracker:https://github.com/TheTorProject/ooniprobe-android/issues diff --git a/metadata/uk.co.keepawayfromfire.screens.txt b/metadata/uk.co.keepawayfromfire.screens.txt index 7f811e1568..a0f82c8281 100644 --- a/metadata/uk.co.keepawayfromfire.screens.txt +++ b/metadata/uk.co.keepawayfromfire.screens.txt @@ -1,5 +1,5 @@ Categories:System -License:SimplifiedBSD +License:BSD-2-Clause Web Site:http://keepawayfromfire.co.uk/screens.html Source Code:https://github.com/Cj-Malone/Screens Issue Tracker:https://github.com/Cj-Malone/Screens/issues From 04a95fd8701d8a4d008a3c6132b2cebb63b5ef67 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 11:42:10 +0200 Subject: [PATCH 08/16] license correction: Apache --> Apache-2.0 Based on manually reading the license. --- metadata/tw.qtlin.mac.airunlocker.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/tw.qtlin.mac.airunlocker.txt b/metadata/tw.qtlin.mac.airunlocker.txt index 7385a9a0aa..d8266148ca 100644 --- a/metadata/tw.qtlin.mac.airunlocker.txt +++ b/metadata/tw.qtlin.mac.airunlocker.txt @@ -1,5 +1,5 @@ Categories:System -License:Apache +License:Apache-2.0 Web Site:https://airunlock.qtlin.tw Source Code:https://github.com/pinetum/AirUnlock-for-Android Issue Tracker:https://github.com/pinetum/AirUnlock-for-Android/issues From e6b894de33c67bf05bd753f8df4ddb5dd84ce5c4 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 11:43:03 +0200 Subject: [PATCH 09/16] use license that actually covers the whole project If a more restrictive license is combined with a less restrictive one, then the more restrictive one is the license for the whole app. --- metadata/net.lardcave.keepassnfc.txt | 2 +- metadata/org.gfd.gsmlocation.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/net.lardcave.keepassnfc.txt b/metadata/net.lardcave.keepassnfc.txt index 220447619a..aa2ce58174 100644 --- a/metadata/net.lardcave.keepassnfc.txt +++ b/metadata/net.lardcave.keepassnfc.txt @@ -1,5 +1,5 @@ Categories:Connectivity -License:Unlicense,Apache2 +License:Apache-2.0 Web Site:http://code.lardcave.net/entries/2013/04/01/215058 Source Code:https://github.com/nfd/KeePassNFC Issue Tracker:https://github.com/nfd/KeePassNFC/issues diff --git a/metadata/org.gfd.gsmlocation.txt b/metadata/org.gfd.gsmlocation.txt index b632861768..a69abe2ac1 100644 --- a/metadata/org.gfd.gsmlocation.txt +++ b/metadata/org.gfd.gsmlocation.txt @@ -1,5 +1,5 @@ Categories:Navigation -License:Apache2,CC-BY-SA-3.0 +License:CC-BY-SA-3.0 Web Site: Source Code:https://github.com/rtreffer/LocalGSMLocationProvider Issue Tracker:https://github.com/rtreffer/LocalGSMLocationProvider/issues From 0c97c131de32c8683f56df59e551e89369ef199a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 11:47:22 +0200 Subject: [PATCH 10/16] license correction: --> EPL-1.0 https://spdx.org/licenses/EPL-1.0.html Manually inspected the license: grep '^License:' metadata/*.txt|grep EPL #234 --- metadata/com.example.android.maxpapers.txt | 2 +- metadata/com.unitedcoders.android.gpodroid.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/com.example.android.maxpapers.txt b/metadata/com.example.android.maxpapers.txt index b5e21e7b47..1b55b01b70 100644 --- a/metadata/com.example.android.maxpapers.txt +++ b/metadata/com.example.android.maxpapers.txt @@ -1,5 +1,5 @@ Categories:Theming -License:EPL +License:EPL-1.0 Web Site:https://code.google.com/p/lcarswallpaper Source Code:https://code.google.com/p/lcarswallpaper/source Issue Tracker: diff --git a/metadata/com.unitedcoders.android.gpodroid.txt b/metadata/com.unitedcoders.android.gpodroid.txt index fdd1d151b0..997b461d4c 100644 --- a/metadata/com.unitedcoders.android.gpodroid.txt +++ b/metadata/com.unitedcoders.android.gpodroid.txt @@ -1,6 +1,6 @@ Disabled:Stopped being distributed elsewhere Categories:Multimedia -License:EPLv1 +License:EPL-1.0 Web Site:http://united-coders.com/gpodroid Source Code:https://github.com/gpodder/GpodRoid Issue Tracker:https://github.com/gpodder/GpodRoid/issues From 286383db09547ed93cfe1a899d2be025d1cecf86 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 11:47:47 +0200 Subject: [PATCH 11/16] license correction: CMU --> MIT-CMU https://spdx.org/licenses/MIT-CMU.html Manually inspected the license: grep '^License:' metadata/*.txt|grep CMU #234 --- metadata/edu.cmu.cs.speech.tts.flite.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/edu.cmu.cs.speech.tts.flite.txt b/metadata/edu.cmu.cs.speech.tts.flite.txt index 03926f3305..7ca05121d2 100644 --- a/metadata/edu.cmu.cs.speech.tts.flite.txt +++ b/metadata/edu.cmu.cs.speech.tts.flite.txt @@ -1,5 +1,5 @@ Categories:Multimedia -License:CMU +License:MIT-CMU Web Site:http://www.festvox.org/flite/ Source Code:https://github.com/happyalu/Flite-TTS-Engine-for-Android Issue Tracker:https://github.com/happyalu/Flite-TTS-Engine-for-Android/issues From 89f7ecc875a630f11f962bf0b49cc269c711083c Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 11:50:58 +0200 Subject: [PATCH 12/16] license correction: EUPL --> EUPL-1.1 https://spdx.org/licenses/EUPL-1.1.html Manually inspected the license: grep '^License:' metadata/*.txt|grep EUPL #234 --- metadata/dk.andsen.asqlitemanager.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/dk.andsen.asqlitemanager.txt b/metadata/dk.andsen.asqlitemanager.txt index d08854ce8c..b0b06bd1aa 100644 --- a/metadata/dk.andsen.asqlitemanager.txt +++ b/metadata/dk.andsen.asqlitemanager.txt @@ -1,5 +1,5 @@ Categories:Development -License:EUPL +License:EUPL-1.1 Web Site:http://aaa.andsen.dk/aSQLiteManager.html Source Code:https://sourceforge.net/p/asqlitemanager/code Issue Tracker:https://sourceforge.net/p/asqlitemanager/bugs From 40487793709ef24c4ff86416b9169cd8ae75fa94 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 11:53:47 +0200 Subject: [PATCH 13/16] license correction: Artistic2 --> Artistic-2.0 https://spdx.org/licenses/Artistic-2.0.html #234 --- metadata/com.jefftharris.passwdsafe.txt | 2 +- metadata/com.kodarkooperativet.notificationstopwatch.txt | 2 +- metadata/com.qubling.sidekick.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata/com.jefftharris.passwdsafe.txt b/metadata/com.jefftharris.passwdsafe.txt index fa3b97ba7f..a96c955b26 100644 --- a/metadata/com.jefftharris.passwdsafe.txt +++ b/metadata/com.jefftharris.passwdsafe.txt @@ -1,6 +1,6 @@ AntiFeatures:UpstreamNonFree Categories:Security -License:Artistic2 +License:Artistic-2.0 Web Site:http://passwdsafe.sourceforge.net Source Code:https://sourceforge.net/p/passwdsafe/code/ci/default/tree Issue Tracker:https://sourceforge.net/projects/passwdsafe/support diff --git a/metadata/com.kodarkooperativet.notificationstopwatch.txt b/metadata/com.kodarkooperativet.notificationstopwatch.txt index 6edf13ad91..0678379f02 100644 --- a/metadata/com.kodarkooperativet.notificationstopwatch.txt +++ b/metadata/com.kodarkooperativet.notificationstopwatch.txt @@ -1,5 +1,5 @@ Categories:System -License:Artistic2 +License:Artistic-2.0 Web Site: Source Code:https://github.com/KodarKooperativet/NotificationStopwatch Issue Tracker:https://github.com/KodarKooperativet/NotificationStopwatch/issues diff --git a/metadata/com.qubling.sidekick.txt b/metadata/com.qubling.sidekick.txt index ff8cd99808..00e91b2641 100644 --- a/metadata/com.qubling.sidekick.txt +++ b/metadata/com.qubling.sidekick.txt @@ -1,5 +1,5 @@ Categories:Development -License:Artistic2 +License:Artistic-2.0 Web Site: Source Code:https://github.com/zostay/CPAN-Sidekick Issue Tracker:https://github.com/zostay/CPAN-Sidekick/issues From b1f5861b2c6ebef977f56fd8550882a896d319f5 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 11:59:46 +0200 Subject: [PATCH 14/16] license correction: AGPL --> AGPL-3.0 https://spdx.org/licenses/AGPL-3.0.html #234 --- metadata/com.sli.juicymobile.txt | 2 +- metadata/com.sli.ohmcalc.txt | 2 +- metadata/fr.xtof54.dragonGoApp.txt | 2 +- metadata/net.micode.fileexplorer.txt | 2 +- metadata/org.tigase.messenger.phone.pro.txt | 2 +- metadata/org.webodf.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/metadata/com.sli.juicymobile.txt b/metadata/com.sli.juicymobile.txt index d034472850..dd44fa68ee 100644 --- a/metadata/com.sli.juicymobile.txt +++ b/metadata/com.sli.juicymobile.txt @@ -1,5 +1,5 @@ Categories:Science & Education -License:AGPL +License:AGPL-3.0 Web Site: Source Code:https://github.com/sli/juicy-mobile Issue Tracker:https://github.com/sli/juicy-mobile/issues diff --git a/metadata/com.sli.ohmcalc.txt b/metadata/com.sli.ohmcalc.txt index 1b880a3335..bc9a839675 100644 --- a/metadata/com.sli.ohmcalc.txt +++ b/metadata/com.sli.ohmcalc.txt @@ -1,5 +1,5 @@ Categories:Science & Education -License:AGPL +License:AGPL-3.0 Web Site: Source Code:https://github.com/sli/ohmcalc Issue Tracker:https://github.com/sli/ohmcalc/issues diff --git a/metadata/fr.xtof54.dragonGoApp.txt b/metadata/fr.xtof54.dragonGoApp.txt index e2ed7fddd9..f2f8741300 100644 --- a/metadata/fr.xtof54.dragonGoApp.txt +++ b/metadata/fr.xtof54.dragonGoApp.txt @@ -1,5 +1,5 @@ Categories:Games -License:AGPL +License:AGPL-3.0 Web Site: Source Code:https://github.com/cerisara/DragonGoApp Issue Tracker:https://github.com/cerisara/DragonGoApp/issues diff --git a/metadata/net.micode.fileexplorer.txt b/metadata/net.micode.fileexplorer.txt index 02c759b974..1e0ef37190 100644 --- a/metadata/net.micode.fileexplorer.txt +++ b/metadata/net.micode.fileexplorer.txt @@ -1,5 +1,5 @@ Categories:System -License:AGPL +License:AGPL-3.0 Web Site:http://micode.net Source Code:https://github.com/MiCode/FileExplorer Issue Tracker:https://github.com/MiCode/FileExplorer/issues diff --git a/metadata/org.tigase.messenger.phone.pro.txt b/metadata/org.tigase.messenger.phone.pro.txt index 4401ab7e2c..b60328d4c4 100644 --- a/metadata/org.tigase.messenger.phone.pro.txt +++ b/metadata/org.tigase.messenger.phone.pro.txt @@ -1,5 +1,5 @@ Categories:Internet -License:AGPL +License:AGPL-3.0 Web Site:https://projects.tigase.org/projects/tigase-mobilemessenger Source Code:https://projects.tigase.org/projects/tigase-mobilemessenger/repository Issue Tracker:https://projects.tigase.org/projects/tigase-mobilemessenger/issues diff --git a/metadata/org.webodf.txt b/metadata/org.webodf.txt index b25bd34ef9..9f05ada7b6 100644 --- a/metadata/org.webodf.txt +++ b/metadata/org.webodf.txt @@ -1,5 +1,5 @@ Categories:Reading -License:AGPL +License:AGPL-3.0+ Web Site:http://webodf.org Source Code:https://github.com/kogmbh/WebODF Issue Tracker:https://github.com/kogmbh/WebODF/issues From d718a64039c9242a12e971f11c21d76fbf77af41 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 12:15:11 +0200 Subject: [PATCH 15/16] license correction: add versions to GPL and LGPL This was done by manual inspection, and includes a couple of minor license corrections, e.g. GPL vs LGPL. for f in `grep '^License:' metadata/*.txt|grep GPL | grep -v GPL-| cut -d : -f 1|sort -u | sed 's,\.txt,,'|cut -d / -f 2`; do echo $f; find build/$f/ -iname '*license*' -o -iname 'COPYING*' -o -iname 'notice*' | xargs less ; done #234 --- metadata/com.drodin.zxdroid.txt | 2 +- metadata/com.falconware.prestissimo.txt | 2 +- metadata/com.glTron.txt | 2 +- metadata/com.max2idea.android.fwknop.txt | 2 +- metadata/com.piratebayfree.txt | 2 +- metadata/com.reicast.emulator.txt | 2 +- metadata/com.shahul3d.indiasatelliteweather.txt | 2 +- metadata/com.ushahidi.android.app.txt | 2 +- metadata/jp.sfjp.webglmol.NDKmol.txt | 2 +- metadata/li.klass.fhem.txt | 2 +- metadata/me.dbarnett.acastus.txt | 2 +- metadata/net.bible.android.activity.txt | 2 +- metadata/net.codechunk.speedofsound.txt | 2 +- metadata/org.liberty.android.fantastischmemo.txt | 2 +- metadata/org.transdroid.search.txt | 2 +- metadata/org.wikilovesmonuments.txt | 2 +- metadata/org.witness.informacam.txt | 2 +- metadata/org.xbmc.android.remote.txt | 2 +- metadata/tkj.android.homecontrol.mythmote.txt | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/metadata/com.drodin.zxdroid.txt b/metadata/com.drodin.zxdroid.txt index 7c9cc9e9ec..812adce816 100644 --- a/metadata/com.drodin.zxdroid.txt +++ b/metadata/com.drodin.zxdroid.txt @@ -1,6 +1,6 @@ Disabled:Licensing issues Categories:Games -License:GPL +License:GPL-2.0 Web Site:https://github.com/drodin/ZXdroid Source Code:https://github.com/drodin/ZXdroid Issue Tracker:https://github.com/drodin/ZXdroid/issues diff --git a/metadata/com.falconware.prestissimo.txt b/metadata/com.falconware.prestissimo.txt index 122a8c7e0e..60f7130780 100644 --- a/metadata/com.falconware.prestissimo.txt +++ b/metadata/com.falconware.prestissimo.txt @@ -1,5 +1,5 @@ Categories:Multimedia -License:LGPL +License:LGPL-2.1 Web Site: Source Code:https://github.com/TheRealFalcon/Prestissimo Issue Tracker:https://github.com/TheRealFalcon/Prestissimo/issues diff --git a/metadata/com.glTron.txt b/metadata/com.glTron.txt index 75c20aebc8..6ac64f6f68 100644 --- a/metadata/com.glTron.txt +++ b/metadata/com.glTron.txt @@ -1,5 +1,5 @@ Categories:Games -License:GPL +License:GPL-3.0 Web Site: Source Code:https://github.com/Chluverman/android-gltron Issue Tracker:https://github.com/Chluverman/android-gltron/issues diff --git a/metadata/com.max2idea.android.fwknop.txt b/metadata/com.max2idea.android.fwknop.txt index 8c83e8cfa6..fdad5d9612 100644 --- a/metadata/com.max2idea.android.fwknop.txt +++ b/metadata/com.max2idea.android.fwknop.txt @@ -1,5 +1,5 @@ Categories:Internet -License:GPL +License:GPL-2.0 Web Site:http://www.cipherdyne.org Source Code:https://github.com/mrash/fwknop Issue Tracker:https://github.com/mrash/fwknop/issues diff --git a/metadata/com.piratebayfree.txt b/metadata/com.piratebayfree.txt index b0eff6f0b1..cb335baad9 100644 --- a/metadata/com.piratebayfree.txt +++ b/metadata/com.piratebayfree.txt @@ -1,6 +1,6 @@ AntiFeatures:UpstreamNonFree Categories:Internet -License:GPL +License:GPL-2.0 Web Site:http://tpbapp.com Source Code:https://github.com/tpbapp/Pirate-Proxy Issue Tracker:https://github.com/tpbapp/Pirate-Proxy/issues diff --git a/metadata/com.reicast.emulator.txt b/metadata/com.reicast.emulator.txt index 47fc83dc3b..0cdc04d47b 100644 --- a/metadata/com.reicast.emulator.txt +++ b/metadata/com.reicast.emulator.txt @@ -1,6 +1,6 @@ AntiFeatures:UpstreamNonFree Categories:Games -License:GPL +License:GPL-2.0 Web Site:http://reicast.com Source Code:https://github.com/reicast/reicast-emulator Issue Tracker:https://github.com/reicast/reicast-emulator/issues diff --git a/metadata/com.shahul3d.indiasatelliteweather.txt b/metadata/com.shahul3d.indiasatelliteweather.txt index cea7f8a364..c2ae2e434d 100644 --- a/metadata/com.shahul3d.indiasatelliteweather.txt +++ b/metadata/com.shahul3d.indiasatelliteweather.txt @@ -1,6 +1,6 @@ AntiFeatures:UpstreamNonFree Categories:Science & Education -License:GPL +License:GPL-2.0 Web Site: Source Code:https://github.com/Shahul3D/IndiaSatelliteWeather Issue Tracker:https://github.com/Shahul3D/IndiaSatelliteWeather/issues diff --git a/metadata/com.ushahidi.android.app.txt b/metadata/com.ushahidi.android.app.txt index efce19d5e4..43085699da 100644 --- a/metadata/com.ushahidi.android.app.txt +++ b/metadata/com.ushahidi.android.app.txt @@ -1,5 +1,5 @@ Categories:Navigation -License:LGPL +License:LGPL-3.0 Web Site: Source Code:https://github.com/ushahidi/Ushahidi_Android Issue Tracker: diff --git a/metadata/jp.sfjp.webglmol.NDKmol.txt b/metadata/jp.sfjp.webglmol.NDKmol.txt index 7892c462b6..49eccf2f6b 100644 --- a/metadata/jp.sfjp.webglmol.NDKmol.txt +++ b/metadata/jp.sfjp.webglmol.NDKmol.txt @@ -1,5 +1,5 @@ Categories:Science & Education -License:LGPL +License:GPL-3.0 Web Site:http://webglmol.sourceforge.jp Source Code:https://github.com/biochem-fan/NDKmol Issue Tracker:http://sourceforge.jp/projects/webglmol/forums diff --git a/metadata/li.klass.fhem.txt b/metadata/li.klass.fhem.txt index 1e99313d48..cf4dac78d6 100644 --- a/metadata/li.klass.fhem.txt +++ b/metadata/li.klass.fhem.txt @@ -1,6 +1,6 @@ AntiFeatures:UpstreamNonFree Categories:Internet -License:GPL +License:GPL-3.0 Web Site:http://andfhem.klass.li Source Code:https://github.com/klassm/andFHEM Issue Tracker:https://github.com/klassm/andFHEM/issues diff --git a/metadata/me.dbarnett.acastus.txt b/metadata/me.dbarnett.acastus.txt index 3ea548823b..baeb4981f8 100644 --- a/metadata/me.dbarnett.acastus.txt +++ b/metadata/me.dbarnett.acastus.txt @@ -1,5 +1,5 @@ Categories:Navigation -License:LGPL +License:LGPL-3.0 Web Site:https://danielbarnett714.github.io/Acastus/ Source Code:https://github.com/DanielBarnett714/Acastus Issue Tracker:https://github.com/DanielBarnett714/Acastus/issues diff --git a/metadata/net.bible.android.activity.txt b/metadata/net.bible.android.activity.txt index c1386a1fcb..79c4e44031 100644 --- a/metadata/net.bible.android.activity.txt +++ b/metadata/net.bible.android.activity.txt @@ -1,5 +1,5 @@ Categories:Reading -License:LGPL +License:LGPL-2.1 Web Site: Source Code:https://github.com/mjdenham/and-bible Issue Tracker:https://github.com/mjdenham/and-bible/issues diff --git a/metadata/net.codechunk.speedofsound.txt b/metadata/net.codechunk.speedofsound.txt index f951352541..24a940a3e8 100644 --- a/metadata/net.codechunk.speedofsound.txt +++ b/metadata/net.codechunk.speedofsound.txt @@ -1,5 +1,5 @@ Categories:Multimedia -License:GPL +License:GPL-3.0 Web Site: Source Code:https://github.com/jpeddicord/speedofsound Issue Tracker:https://github.com/jpeddicord/speedofsound/issues diff --git a/metadata/org.liberty.android.fantastischmemo.txt b/metadata/org.liberty.android.fantastischmemo.txt index 66a146899a..e5e022e935 100644 --- a/metadata/org.liberty.android.fantastischmemo.txt +++ b/metadata/org.liberty.android.fantastischmemo.txt @@ -1,5 +1,5 @@ Categories:Science & Education -License:GPL +License:GPL-2.0 Web Site:https://anymemo.org Source Code:https://github.com/helloworld1/AnyMemo Issue Tracker:https://github.com/helloworld1/AnyMemo/issues diff --git a/metadata/org.transdroid.search.txt b/metadata/org.transdroid.search.txt index 4e4292d804..f46aec08be 100644 --- a/metadata/org.transdroid.search.txt +++ b/metadata/org.transdroid.search.txt @@ -1,5 +1,5 @@ Categories:Internet -License:LGPL +License:GPL-3.0 Web Site:http://www.transdroid.org Source Code:https://github.com/erickok/transdroid-search Issue Tracker:https://github.com/erickok/transdroid-search/issues diff --git a/metadata/org.wikilovesmonuments.txt b/metadata/org.wikilovesmonuments.txt index d71c948488..0a4e096d5b 100644 --- a/metadata/org.wikilovesmonuments.txt +++ b/metadata/org.wikilovesmonuments.txt @@ -1,5 +1,5 @@ Categories:Internet -License:GPL +License:GPL-2.0 Web Site:https://www.mediawiki.org/wiki/Wikimedia_mobile_engineering Source Code:https://github.com/wikimedia/WLMMobile Issue Tracker:https://phabricator.wikimedia.org diff --git a/metadata/org.witness.informacam.txt b/metadata/org.witness.informacam.txt index 9660dcc12e..9f076833a9 100644 --- a/metadata/org.witness.informacam.txt +++ b/metadata/org.witness.informacam.txt @@ -1,5 +1,5 @@ Categories:Multimedia -License:GPL +License:GPL-3.0+ Web Site:https://guardianproject.info/apps/informacam Source Code:https://github.com/guardianproject/InformaCam Issue Tracker:https://github.com/guardianproject/InformaCam/issues diff --git a/metadata/org.xbmc.android.remote.txt b/metadata/org.xbmc.android.remote.txt index 2eb38a4c61..ed0c0775cb 100644 --- a/metadata/org.xbmc.android.remote.txt +++ b/metadata/org.xbmc.android.remote.txt @@ -1,5 +1,5 @@ Categories:Multimedia -License:GPL +License:GPL-2.0 Web Site: Source Code:https://github.com/freezy/android-xbmcremote Issue Tracker:https://github.com/freezy/android-xbmcremote/issues diff --git a/metadata/tkj.android.homecontrol.mythmote.txt b/metadata/tkj.android.homecontrol.mythmote.txt index 976dfa4ad2..d3884f629b 100644 --- a/metadata/tkj.android.homecontrol.mythmote.txt +++ b/metadata/tkj.android.homecontrol.mythmote.txt @@ -1,5 +1,5 @@ Categories:Multimedia -License:GPL +License:GPL-2.0 Web Site: Source Code:https://github.com/pot8oe/mythmote Issue Tracker:https://github.com/pot8oe/mythmote/issues From 71a8c9dd7426e2ce63cdfe2d4ceaed1057392241 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2017 12:15:46 +0200 Subject: [PATCH 16/16] license correction: Fair License --> Fair https://spdx.org/licenses/Fair.html #234 --- metadata/bughunter2.smsfilter.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/bughunter2.smsfilter.txt b/metadata/bughunter2.smsfilter.txt index a46a09a55d..e634944849 100644 --- a/metadata/bughunter2.smsfilter.txt +++ b/metadata/bughunter2.smsfilter.txt @@ -1,5 +1,5 @@ Categories:Phone & SMS -License:Fair License +License:Fair Web Site:http://purl.org/net/smsfilter Source Code:http://purl.org/net/smsfilter/source Issue Tracker: