[SCM] marble packaging branch, master, updated. debian/16.08.3-1-154-g84802f6

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:11:46 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=187035d

The following commit has been merged in the master branch:
commit 187035d9c1da7e00386c4a19e8b4a13797b7e579
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jul 7 11:24:41 2016 +0100

    tidy copyright for lintian happyness
---
 debian/copyright | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index 16576cd..e3e8322 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2260,16 +2260,30 @@ Files: COPYING.DOC
        docs/bindings/python/html/common/fdl-license.html
 Copyright: 2000-2002, Free Software Foundation, Inc
 License: GFDL-NIV-1.2
+ This can be found at /usr/share/common-licenses/GFDL-1.2
 
 Files: tools/osm-addresses/pbf/fileformat.proto
        tools/osm-addresses/pbf/osmformat.proto
 Copyright: 2010, Scott A. Crosby <scott at sacrosby.com>
 License: LGPL-3+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of
+ the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Files: data/mwdbii/MWDBPOLY.TXT
        data/mwdbii/contents.txt
 Copyright: no copyright claimed
 License: public-domain
+ The MWDB-POLY database is released to the Public Domain
 
 Files: src/apps/marble-touch/harmattan/MenuItemSwitch.qml
 Copyright: 2011, Dennis Nienhüser <earthwings at gentoo.org>
@@ -2328,6 +2342,7 @@ Comment: LICENSE.txt is copy of LGPL-2.1
 Files: src/lib/marble/htmlfeatures/bootstrap.min.css
 Copyright: 2012, Twitter, Inc
 License: Apache-2.0
+ This can be found at /usr/share/common-licenses/Apache-2.0
 
 Files: debian/*
 Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.launchpad.net>

-- 
marble packaging



More information about the pkg-kde-commits mailing list