[Git][debian-gis-team/merkaartor][master] Debian patch 0.18.4+ds-1 (second attempt)
Jérôme Benoit
gitlab at salsa.debian.org
Thu Apr 16 09:58:54 BST 2020
Jérôme Benoit pushed to branch master at Debian GIS Project / merkaartor
Commits:
07bbc0a1 by Jerome Benoit at 2020-04-16T12:56:44+04:00
Debian patch 0.18.4+ds-1 (second attempt)
- - - - -
3 changed files:
- debian/changelog
- debian/copyright
- debian/source/lintian-overrides
Changes:
=====================================
debian/changelog
=====================================
@@ -1,14 +1,11 @@
-merkaartor (0.18.4+ds-2) UNRELEASED; urgency=medium
+merkaartor (0.18.4+ds-1) unstable; urgency=medium
- * Team upload.
+ [ Bas Couwenberg ]
* Add gbp.conf to use pristine-tar & --source-only-changes by default.
* Restructure control file with cme.
* Drop Name field from upstream metadata.
- -- Bas Couwenberg <sebastic at debian.org> Fri, 07 Feb 2020 15:31:58 +0100
-
-merkaartor (0.18.4+ds-1) unstable; urgency=medium
-
+ [ Jerome Benoit ]
* Reintroduction release (Closes: #949792), new package uploader.
* New upstream release (Closes: #949183).
* Debianization:
@@ -19,8 +16,8 @@ merkaartor (0.18.4+ds-1) unstable; urgency=medium
- debhelper, bump to version 12;
- debian/copyright:
- Files-Excluded field, introduce;
- - Files main paragraph, cleanup;
- - Files paragraphs, cleanup;
+ - Files main paragraph, harden;
+ - Files paragraphs, harden;
- License paragraphs, cleanup;
- debian/watch:
- migration to version 4;
@@ -34,7 +31,7 @@ merkaartor (0.18.4+ds-1) unstable; urgency=medium
- debian/docs, improve;
- debian/{dirs,compat,README.source,gbp.conf}, discard.
- -- Jerome Benoit <calculus at rezozer.net> Fri, 07 Feb 2020 11:02:15 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Thu, 16 Apr 2020 08:55:48 +0000
merkaartor (0.18.3+ds-6) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -24,39 +24,49 @@ Copyright: 2005, Robin Gingras
2006-2016, Bart Vanhauwaert <bvh-osm at irule.be>
2006-2016, Chris Browet <cbro at semperpax.com>
2006-2016, Ladislav Láska <krakonos at krakonos.org>
-License: GPL-2+
+License: GPL-3+
+Comment:
+ The upstream source is distributed under the license GPL-2+, however
+ it contains some LGPL-3+ and GPL-3+ material. Therefore, by combination
+ (cf. <https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility>) its
+ effective license is GPL-3+.
-Files: 3rdparty/qtsingleapplication-2.6_1-opensource/*
+Files:
+ 3rdparty/qtsingleapplication-2.6_1-opensource/*
src/QToolBarDialog/qttoolbardialog.cpp
src/QToolBarDialog/qttoolbardialog.h
+ Icons/QToolBarDialog/*
Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies)
License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+Comment:
+ The or-chain of licenses if the one found in the qttoolbardialog.{h,cpp}
+ C++ sources. Second, there is no explicit license for the icons, but the
+ history of the upstream GIT repository indicates that they cames along the
+ qttoolbardialog.{h,cpp} C++ sources. This is old material, and the original
+ source ball could not be found.
+
+Files:
+ src/ImportExport/fileformat.proto
+ src/ImportExport/osmformat.proto
+Copyright: 2010, Scott A. Crosby. <scott at sacrosby.com>
+License: LGPL-3+
Files: plugins/background/MCadastreFranceBackground/qadastre/*
Copyright: 2010, Pierre Ducroquet <pinaraf at pinaraf.info>
License: GPL-3+
+Files: Icons/Mapnik/*
+Copyright: n/a
+License: public-domain
+ These files are an heteroclite collection of PNG images whose each info part
+ contains no copyright notice.
+
Files: debian/*
Copyright: 2006, bart <bvh-osm at irule.be>
2008, Christoph Berg <myon at debian.org>
2008-2009, Bernd Zeimetz <bzed at debian.org>
2020, Jerome Benoit <calculus at rezozer.net>
-License: GPL-2+
-
-License: GPL-2+
- 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 2 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.
- .
- On Debian systems, the full text of the GNU General Public License
- version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+License: GPL-3+
License: GPL-3
This program is free software: you can redistribute it and/or modify
@@ -91,22 +101,13 @@ License: GPL-3+
On Debian systems, the complete text of the GNU General Public License
version 3 can be found in `/usr/share/common-licenses/GPL-3'.
-License: QT-Commercial
- Commercial License Usage
- Licensees holding valid commercial Qt licenses may use this file in
- accordance with the commercial license agreement provided with the
- Software or, alternatively, in accordance with the terms contained in
- a written agreement between you and Digia. For licensing terms and
- conditions see http://qt.digia.com/licensing. For further information
- use the contact form at http://qt.digia.com/contact-us.
-
License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
Alternatively, this file may be used under the terms of the GNU Lesser
General Public License version 2.1 as published by the Free Software
Foundation and appearing in the file LICENSE.LGPL included in the
packaging of this file. Please review the following information to
ensure the GNU Lesser General Public License version 2.1 requirements
- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ will be met: <http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html>.
.
In addition, as a special exception, Digia gives you certain additional
rights. These rights are described in the Digia Qt LGPL Exception
@@ -134,3 +135,28 @@ License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
Furthermore, you are not required to apply this additional permission to a
modified version of the Library.
+License: LGPL-3+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ .
+ This package 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-3'.
+
+License: QT-Commercial
+ Commercial License Usage
+ Licensees holding valid commercial Qt licenses may use this file in
+ accordance with the commercial license agreement provided with the
+ Software or, alternatively, in accordance with the terms contained in
+ a written agreement between you and Digia. For licensing terms and
+ conditions see http://qt.digia.com/licensing. For further information
+ use the contact form at <http://qt.digia.com/contact-us>.
=====================================
debian/source/lintian-overrides
=====================================
@@ -1,3 +1,6 @@
+# GitHub source ball
+debian-watch-does-not-check-gpg-signature
+
# interface software
testsuite-autopkgtest-missing
View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/commit/07bbc0a1a07a7f833cee6f35921733568fa089fb
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/commit/07bbc0a1a07a7f833cee6f35921733568fa089fb
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200416/8e0d90e3/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list