[libreoffice-dictionaries] 01/01: Revert "move a loads of " or " in License: to |"

Rene Engelhard rene at moszumanska.debian.org
Tue Jun 20 05:07:52 UTC 2017 

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice-dictionaries.

commit dd2eb48d0f3f0d723eaa9835bb9f4532dbf98975
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jun 20 07:06:59 2017 +0200

    Revert "move a loads of " or " in License: to |"
    
    "or" is actually correct as of
    https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/#license-syntax
    
    This reverts commit be29ddaa3c4969196c6e731890965785fab1237b.
---
 debian/copyright | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 574f938..6f3ec0f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,7 @@ License: LGPL-3
 
 Files: dictionaries/util/*
 Copyright: Steven Butler <sebutler at gmail.com>
-License: MPL-1.1 | GPL-3+ | LGPL-3+
+License: MPL-1.1 or GPL-3+ or LGPL-3+
 
 Files: dictionaries/af_ZA/*
 Copyright: 2003 Dwayne Bailey
@@ -24,12 +24,12 @@ License: LGPL-2.1+
 Files: dictionaries/an_ES/*
 Copyright: 2011 Santiago Paricio <sparicio at gmail.com>
            2011 Juan Pablo Martínez <jpmart at unizar.es>
-License: MPL-1.1 | GPL-3+ | LGPL-3+
+License: MPL-1.1 or GPL-3+ or LGPL-3+
 
 Files: dictionaries/ar/*
 Copyright: 2006-2008 Mohamed Kebdani <med.kebdani at gmail.com>
            2006-2009 Taha Zerrouki <taha_zerrouki at gawab.com>
-License: GPL-2+ | LGPL-2.1+ | MPL-1.1
+License: GPL-2+ or LGPL-2.1+ or MPL-1.1
 
 Files: dictionaries/be_BY/*
 Copyright: 2010-2011 Mikalai Udodau <mikalai.udodau at gmail.com>
@@ -51,7 +51,7 @@ License: LGPL
 
 Files: dictionaries/bs_BA/*
 Copyright:
-License: GPL-2+ | LGPL-2.1+ | MPL-1.1
+License: GPL-2+ or LGPL-2.1+ or MPL-1.1
 
 Files: dictionaries/ca/*
 Copyright: 2002-2008 Joan Moratinos <jmo at softcatala.org>
@@ -60,11 +60,11 @@ License: GPL-2+
 
 Files: dictionaries/ca/dictionaries/hyph_ca.dic
 Copyright: 2013-2015 Jaume Ortolà <jaumeortola at gmail.com>
-License: LGPL-3+ | GPL-3+
+License: LGPL-3+ or GPL-3+
 
 Files: dictionaries/ca/dictionaries/th_ca_ES_v3.dat
 Copyright: 2009 Joan Montané <jmontane at softcatala.org>
-License: LGPL-3+ | GPL-3+
+License: LGPL-3+ or GPL-3+
 
 Files: dictionaries/cs_CZ/*
 Copyright: 2003 Pavel Janík <Pavel at Janik.cz>
@@ -80,7 +80,7 @@ License: MPL-2.0
  
 Files: dictionaries/da_DK/*
 Copyright: 2007-2014 Foreningen for frit tilgængelige sprogværktøjer <info at stavekontrolden.dk>
-License: LGPL-2.1 | GPL-2 | MPL-1.1
+License: LGPL-2.1 or GPL-2 or MPL-1.1
 
 Files: dictionaries/da_DK/hyph_da_DK.dic
 Copyright: 1988 Frank Jensen <fj at iesd.auc.dk>
@@ -106,7 +106,7 @@ License: GPL-2
 Files: dictionaries/el_GR/*
 Copyright: 2002 Evripidis Papakostas <evris at source.gr>
            2006 Steve Stavropoulos
-License: MPL-1.1 | GPL-2 | LGPL-2.1
+License: MPL-1.1 or GPL-2 or LGPL-2.1
 
 Files: dictionaries/el_GR/hyph_el_GR.dic
        dictionaries/el_GR/README_hyph_el_GR.txt
@@ -192,7 +192,7 @@ License:
 
 Files: dictionaries/es/*
 Copyright: Santiago Bosio <santiago.bosio at gmail.com>
-License: GPL-3+ | LGPL-3+ | MPL-1.1+
+License: GPL-3+ or LGPL-3+ or MPL-1.1+
 
 Files: dictionaries/es/th_es_ANY_v2.dat
        dictionaries/es/README_th_es_ANY.txt
@@ -262,7 +262,7 @@ Files: dictionaries/hr_HR/*
 Copyright: 2003 Denis Lackovic <delacko at linux.hr>
            2016-2017 Mirko Kos <mirkos99 at gmail.com>
            2014-2017 Kruno <kruno.se at gmx.com>
-License: LGPL | SISSL
+License: LGPL or SISSL
 
 Files: dictionaries/hr_HR/hyph_hr_HR.dic
        dictionaries/hr_HR/README_hyph_hr_HR.txt
@@ -273,7 +273,7 @@ Files: dictionaries/hu_HU/*
 Copyright: 2009 László Németh
            2010 Németh László és Godó Ferenc
            2011 Nagy Bence <nagybence at tipogral.hu>
-License: GPL-2+ | LGPL-2.1+ | MPL-1.1+
+License: GPL-2+ or LGPL-2.1+ or MPL-1.1+
 
 Files: dictionaries/is/*
 Copyright: Orðabók Háskólans
@@ -299,7 +299,7 @@ License: LGPL
 
 Files: dictionaries/kmr_Latn/*
 Copyright: Reimar Heider <hunspell at ferheng.org>
-License: GPL-3 | LGPL-3 | MPL-1.1
+License: GPL-3 or LGPL-3 or MPL-1.1
 
 Files: dictionaries/lo_LA/*
 Copyright: 2013 Brian Eugene Wilson
@@ -332,7 +332,7 @@ Files: dictionaries/nl_NL/*
 Copyright: 1996 Nederlandstalige Tex Gebruikersgroep
            2001-2005 Simon Brouwer e.a.
            2006-2010 OpenTaal
-License: BSD-2-clause | CC-BY-3.0
+License: BSD-2-clause or CC-BY-3.0
 
 Files: dictionaries/no/*
 Copyright: The spell-norwegian project, <URL:https://alioth.debian.org/projects/spell-norwegian/>
@@ -344,7 +344,7 @@ License: GPL-2+
 
 Files: dictionaries/pl_PL/*
 Copyright: Marek Futrega <futrega at gmail.com>
-License: GPL | LGPL | MPL
+License: GPL or LGPL or MPL
 
 Files: dictionaries/pl_PL/th*
 Copyright: 2004-2008 Marcin Miłkowski <milek_pl at users.sourceforge.net>
@@ -361,13 +361,13 @@ License: LGPL
 
 Files: dictionaries/pt_BR/*
 Copyright: 2006-2013 Raimundo Santos Moura <raimundo.smoura at gmail.com>
-License: LGPL-3 | MPL
+License: LGPL-3 or MPL
 
 Files: dictionaries/pt_PT/*
 Copyright: 2006-2012  José João de Almeida <jj at di.uminho.pt>
                       Rui Vilela <ruivilela at di.uminho.pt>
                       Alberto Simões <ambs at di.uminho.pt>
-License: GPL-2 | LGPL-2.1 | MPL-1.1
+License: GPL-2 or LGPL-2.1 or MPL-1.1
 
 Files: dictionaries/pt_PT/hyph_pt_PT.dic
        dictionaries/pt_PT/README_hyph_pt_PT.txt
@@ -390,7 +390,7 @@ Copyright: Lucian Constantin
            Cătălin Frâncu
            Ionel Mugurel Ciobică <tgakic at sg10 chem tue nl>
            Mihai Budiu <mihaib at cs cmu edu>
-License: GPL-2 | LGPL-2.1 | MPL-1.1
+License: GPL-2 or LGPL-2.1 or MPL-1.1
 
 Files: dictionaries/ro/hyph_ro_RO.dic
 Copyright: Adrian Stoica <andrian.stoica at cuvinte.ro>
@@ -442,7 +442,7 @@ License: GPL-3+
 
 Files: dictionaries/sk_SK/*
 Copyright: sk-spell (http://sk-spell.sk.cx/)
-License: GPL-2 | LGPL-2.1 | MPL-1.1
+License: GPL-2 or LGPL-2.1 or MPL-1.1
 
 Files: dictionaries/sk_SK/th_sk_SK_v2.dat
        dictionaries/sk_SK/README_th_sk_SK_v2.txt
@@ -474,19 +474,19 @@ Copyright: Amebis, d.o.o.
            Martin Srebotnjak <miles at filmsi.net>
            Primož Peterlin
            Robert Ludvik <r at aufbix.org>
-License: GPL | LGPL
+License: GPL or LGPL
 
 Files: dictionaries/sl_SI/hyph_sl_SI.dic
        dictionaries/sl_SI/README_hyph_sl_SI.txt
 Copyright: Matjaz Vrecko, MG-SOFT Corp. <matjaz.vrecko at mg-soft.si>
            Mojca Miklavec <mojca.miklavec.lists at gmail.com>
-License: GPL | LGPL
+License: GPL or LGPL
 
 Files: dictionaries/sr/*
 Copyright: 2013 Goran Rakic <grakic at devbase.net>
            Milos Popovic <gpopac at gmail.com>
            Aleksandar Urosevic <urke.dd at urosevic.net>
-License: GPL-2+ | LGPL-2.1 | MPL-1.1
+License: GPL-2+ or LGPL-2.1 or MPL-1.1
 
 Files: dictionaries/sv_SE/*
 Copyright: 2003-2014 Göran Andersson <goran at init.se>
@@ -495,7 +495,7 @@ License: LGPL-3
 Files: dictionaries/sv_SE/hyph_sv.dic
        dictionaries/sv_SE/README_hyph_sv.txt
 Copyright: 2013 Niklas Johansson <sleeping.pillow at gmail.com>
-License: MPL | LGPL-3+
+License: MPL or LGPL-3+
 
 Files: dictionaries/sv_SE/th_sv_SE.dat
        dictionaries/sv_SE/README_th_sv_SE.txt
@@ -523,7 +523,7 @@ License: GPL-2+
 Files: dictionaries/te_IN/hyph_te_IN.dic
        dictionaries/te_IN/README_hyph_te_IN.txt
 Copyright: 2009 Santhosh Thottingal <santhosh.thottingal at gmail.com>
-License: GPL-3+ | LGPL-3+
+License: GPL-3+ or LGPL-3+
 
 Files: dictionaries/th_TH/*
 Copyright: 2005 by NECTEC, Thailand
@@ -541,7 +541,7 @@ Copyright: 1999 Vladimir Yakovchuk
            2005 Eugeniy Meshcheryakov
            2005 Dmytro Kovalyov
            2006-2009 Andriy Rysin
-License: GPL-2+ | LGPL-2.1+ | MPL-1.1
+License: GPL-2+ or LGPL-2.1+ or MPL-1.1
 
 Files: dictionaries/uk_UA/hyph_uk_UA.dic
        dictionaries/uk_UA/README_hyph_uk_UA.txt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-dictionaries.git

More information about the Pkg-openoffice-commits mailing list