[neon/neon-packaging/ksanecore/Neon/stable] debian: sync some changes from debian/kubuntu git
Rik Mills
null at kde.org
Fri Nov 4 15:57:47 GMT 2022
Git commit 774d63fd7ac67fe65e341d7c2ea11e10edbd4949 by Rik Mills.
Committed on 04/11/2022 at 15:57.
Pushed by rikmills into branch 'Neon/stable'.
sync some changes from debian/kubuntu git
M +11 -8 debian/control
M +112 -195 debian/copyright
M +2 -0 debian/rules
M +5 -6 debian/upstream/metadata
https://invent.kde.org/neon/neon-packaging/ksanecore/commit/774d63fd7ac67fe65e341d7c2ea11e10edbd4949
diff --git a/debian/control b/debian/control
index 4d2f787..c25537e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,23 +2,26 @@ Source: ksanecore
Section: libs
Priority: optional
Maintainer: Jonathan Esk-Riddell <jr at jriddell.org>
-Build-Depends: cmake,
+Build-Depends: cmake (>= 3.16.0~),
debhelper-compat (= 13),
- extra-cmake-modules,
- libkf5i18n-dev,
+ extra-cmake-modules (>= 5.90.0~),
+ libkf5i18n-dev (>= 5.90.0~),
libsane-dev,
libx11-dev,
pkg-kde-tools,
- qtbase5-dev
-Standards-Version: 4.6.0.1
+ qtbase5-dev (>= 5.15.2~),
+Standards-Version: 4.6.0
Homepage: https://invent.kde.org/libraries/ksanecore
+Rules-Requires-Root: no
Package: libksanecore-dev
Section: libdevel
Architecture: any
-Depends: libksanecore1 (= ${binary:Version}), qtbase5-dev, ${misc:Depends}
+Depends: libksanecore1 (= ${binary:Version}),
+ qtbase5-dev (>= 5.15.2~),
+ ${misc:Depends},
Description: Library providing logic to interface scanners - headers
- This is a library providing logic to interface scanners.
+ Library providing logic to interface scanners.
.
This package contains the scanner library development files.
@@ -26,4 +29,4 @@ Package: libksanecore1
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Library providing logic to interface scanners
- This is a library providing logic to interface scanners.
+ Library providing logic to interface scanners - shared library
diff --git a/debian/copyright b/debian/copyright
index 646c3ab..c840bc7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,229 +1,146 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: libksane
-Source: git://anongit.kde.org/libksane
+Upstream-Name: ksanecore
+https://invent.kde.org/libraries/ksanecore
+Upstream-Contact: kde-devel at kde.org
Files: *
-Copyright: 2002-2003 Stephan Stapel <stephan dot stapel at web dot de>
- 2007-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
- 2007-2017 by Kare Sars <kare.sars at iki .fi>
- 2009 by Matthias Nagl <matthias at nagl dot info>
- 2009 by Grzegorz Kurtyka <grzegorz dot kurtyka at gmail dot com>
- 2007 David Faure <faure at kde.org>
- 2009 Aurélien Gâteau <agateau at kde.org>
- 2014 Gregor Mitsch
- 2008, 2012 zayed <zayed.alsaidi at gmail.com>
- 2010-2012 Yasen Pramatarov <yasen at lindeas.com>
- 2013 Samir Ribić <bs at li.org>
- 2010-2017 Vít Pelčák <vit at pelcak.org>
- 2008-2015 Martin Schlander <mschlander at opensuse.org>
- 2007, 2008 Oliver Dörr <kde at doerr-privat.de>
- 2008 Thomas Reitelbach <tr at erdfunkstelle.de>
- 2008-2015 Burkhard Lück <lueck at hube-lueck.de>
- 2010, 2011 Panagiotis Papadopoulos <pano_90 at gmx.net>
- 2010, 2012 Frederik Schwarzer <schwarzer at kde.org>
- 2010 Johannes Obermayr <johannesobermayr at gmx.de>
- 2007, 2008 Spiros Georgaras <sng at hellug.gr>
- 2007-2009 Toussis Manolis <manolis at koppermind.homelinux.org>
- 2008 Spiros Georgaras <sngeorgaras at otenet.gr>
- 2011, 2012 Stelios <sstavra at gmail.com>
- 2011, 2012 Dimitrios Glentadakis <dglent at gmail.com>
- 2016 Petros Vidalis <pvidalis at gmail.com>
- 2009, 2010 Andrew Coles <andrew_coles at yahoo.co.uk>
- 2009 Malcolm Hunter <malcolm.hunter at gmx.co.uk>
- 2014-2017 Steve Allewell <steve.allewell at gmail.com>
- 2009 Axel Rousseau <axel at esperanto-jeunes.org>
- 2007 Enrique Matias Sanchez (aka Quique) <cronopios at gmail.com>
- 2007, 2008 Santiago Fernández Sancho <santi at kde-es.org>
- 2008-2015 Eloy Cuadra <ecuadra at eloihr.net>
- 2007-2009 Marek Laane <bald at starman.ee>
- 2009-2016 Marek Laane <bald at smail.ee>
- 2009 Enbata <urazpian at hotmail.com>
- 2011, 2018 Iñigo Salvador Azurmendi <xalba at euskalnet.net>
- 2011-2014 Tommi Nieminen <translator at legisign.org>
- 2012-2015 Lasse Liehu <lasse.liehu at gmail.com>
- 2012 Jiri Grönroos <jiri.gronroos+kde at iki.fi>
- 2008-2012 Mickael Sibelle <kimael at gmail.com>
- 2013 xavier <xavier.besnard at neuf.fr>
- 2018 Yoann Laissus <yoann.laissus at gmail.com>
- 2009 Kevin Scannell <kscanne at gmail.com>
- 2007-2009 mvillarino <mvillarino at users.sourceforge.net>
- 2009, 2014 Marce Villarino <mvillarino at gmail.com>
- 2012 Xosé <xosecalvo at gmail.com>
- 2015 Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
- 2018 Adrián Chaves (Gallaecio) <adrian at chaves.io>
- 2008 Ravishankar Shrivastava <raviratlami at yahoo.com>
- 2009 Zarko Pintar <zarko.pintar at gmail.com>
- 2010 Marko Dimjasevic <marko at dimjasevic.net>
- 2009 Tamas Szanto <tszanto at interware.hu>
- 2010, 2011 Kristóf Kiszel <ulysses at kubuntu.org>
- 2012 Balázs Úr <urbalazs at gmail.com>
- 2013, 2017 Giovanni Sora <g.sora at tiscali.it>
- 2008-2016 Sveinn í Felli <sveinki at nett.is>
- 2008-2015 Federico Zenith <federico.zenith at member.fsf.org>
- 2007-2010 Yukiko Bando <ybando at k6.dion.ne.jp>
- 2010, 2014 Fumiaki Okushi <fumiaki.okushi at gmail.com>
- 2010-2013 Sairan Kikkarin <sairan at computer.org>
- 2008-2012 Khoem Sokhem <khoemsokhem at khmeros.info>
- 2008 Eng Vannak <evannak at khmeros.info>
- 2010 Seng Sutha
- 2008-2015 Shinjo Park <kde at peremen.name>
- 2007-2009 Donatas Glodenis <dgvirtual at akl.lt>
- 2011 Remigijus Jarmalavičius <remigijus at jarmalavicius.lt>
- 2011, 2013 Liudas Ališauskas <liudas.alisauskas at gmail.com>
- 2015 Mindaugas Baranauskas <opensuse.lietuviu.kalba at gmail.com>
- 2008, 2010 Viesturs Zarins <viesturs.zarins at mii.lu.lv>
- 2008 Maris Nartiss <maris.kde at gmail.com>
- 2009 Viesturs Zariņš <viesturs.zarins at mii.lu.lv>
- 2013 Chetan Khona <chetan at kompkin.com>
- 2008-2012 Bjørn Steensrud <bjornst at skogkatt.homelinux.org>
- 2007-2014 Sönke Dibbern <s_dibbern at web.de>
- 2010, 2011 Manfred Wiese <m.j.wiese at web.de>
- 2008 Rinse de Vries <rinsedevries at kde.nl>
- 2008-2015 Freek de Kruijf <freekdekruijf at kde.nl>
- 2009 Kristof Bal <kristof.bal at gmail.com>
- 2008-2016 Karl Ove Hufthammer <karl at huftis.org>
- 2008 Amanpreet Singh <aalam at users.sf.net>
- 2009-2012 A S Alam <aalam at users.sf.net>
- 2008-2010 Maciej Wikło <maciej.wiklo at wp.pl>
- 2008 Marta Rybczyńska <kde-i18n at rybczynska.net>
- 2011-2017 Łukasz Wojniłowicz <lukasz.wojnilowicz at gmail.com>
- 2015 José Nuno Coelho Pires <zepires at gmail.com>
- 2007 Diniz Bortolotto <diniz.bortolotto at gmail.com>
- 2008-2015 André Marcelo Alvarenga <alvarenga at kde.org>
- 2009 Luiz Fernando Ranghetti <elchevive at opensuse.org>
- 2008-2009 Sergiu Bivol <sergiu at ase.md>
- 2009 Dimitriy Ryazantcev <DJm00n at mail.ru>
- 2009 Nick Shaforostoff <shaforostoff at kde.ru>
- 2009 Andrey Cherepanov <skull at kde.ru>
- 2009, 2010 Artem Sereda <overmind88 at gmail.com>
- 2010-2017 Alexander Potashev <aspotashev at gmail.com>
- 2012 Yuri Efremov <yur.arh at gmail.com>
- 2013 Alexander Lakhin <exclusion at gmail.com>
- 2007, 2009 Richard Fric <Richard.Fric at kdemail.net>
- 2012, 2015 Roman Paholík <wizzardsk at gmail.com>
- 2008-2013 Jure Repinc <jlp at holodeck1.com>
- 2013, 2015 Andrej Mernik <andrejm at ubuntu.si>
- 2007-2015 Stefan Asserhäll <stefan.asserhall at bredband.net>
- 2010, 2013 Ozan Çağlayan <ozan at pardus.org.tr>
- 2008-2012 obsoleteman <tulliana at gmail.com>
- 2013, 2017 Volkan Gezer <volkangezer at gmail.com>
- 2011 Sahran <sahran.ug at gmail.com>
- 2009 Jean Cayron <jean.cayron at gmail.com>
- 2007-2012 Ni Hui <shuizhuyuanluo at 126.com>
- 2011 FengChao <rainofchaos at gmail.com>
- 2015 Weng Xuetian <wengxt at gmail.com>
- 2008-2012 Franklin Weng <franklin at goodhorse.idv.tw>
- 2016 Jeff Huang <s8321414 at gmail.com>
- 2008-2018 Josep Ma. Ferrer <txemaq at gmail.com>
- 2015, 2016 Antoni Bella Pérez <antonibella5 at yahoo.com>
- 2008-2018 Yuri Chornoivan <yurchor at ukr.net>
- 2008 Ivan Petrouchtchak <fr.ivan at ukrainian-orthodox.org>
-License: LGPL-2.1 or LGPL-3 or KDEeV
+Copyright: 2006, Marcus Hufgard <hufgardm at hufgard.de>
+ 2007-2008, Gilles Caulier <caulier.gilles at gmail.com>
+ 2007-2010, Kare Sars <kare.sars at iki.fi>
+ 2009, Grzegorz Kurtyka <grzegorz.kurtyka at gmail.com>
+ 2009, Matthias Nagl <matthias at nagl.info>
+ 2014, Gregor Mitsch <codeminister at publicstatic.de>
+ 2018, Alexander Volkov <a.volkov at rusbitech.ru>
+ 2021-2022, Alexander Stippich <a.stippich at gmx.net>
+License: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-Files: src/version.h.cmake
-Copyright: 2007 Gilles Caulier <caulier dot gilles at gmail dot com>
-License: GPL-2+
+Files: CMakeLists.txt
+ KSaneCoreConfig.cmake.in
+ autotests/CMakeLists.txt
+ cmake-modules/FindSane.cmake
+ src/CMakeLists.txt
+Copyright: Gilles Caulier <caulier.gilles at gmail.com>
+ Kåre Sårs <kare.sars at iki.fi>
+ 2006, Marcus Hufgard <hufgardm at hufgard.de>
+License: BSD-3-clause
+
+Files: metainfo.yaml
+ README.md
+ src/Messages.sh
+ TODO
+Copyright: Gilles Caulier <caulier.gilles at gmail.com>
+ Kåre Sårs <kare.sars at iki.fi>
+ 2006, Marcus Hufgard <hufgardm at hufgard.de>
+License: CC0-1.0
Files: debian/*
-Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.launchpad.net>
- 2019 Scarlett Moore <sgmoore at kde.org>
-License: GPL-2+
+Copyright: 2022, Jonathan Esk-Riddell <jr at jriddell.org>
+ 2022, Rik Mills <rikmills at kde.org>
+License: GPL-2.0-or-later
-Files: ksanetwain/twain.h
-Copyright: 1991, 1992 TWAIN Working Group: Aldus, Caere, Eastman-Kodak, Hewlett-Packard and Logitech Corporations.
- 1997 TWAIN Working Group: Bell+Howell, Canon, DocuMagix, Fujitsu, Genoa Technology, Hewlett-Packard, Kofax Imaging Products, and Ricoh Corporation.
- 1998 TWAIN Working Group: Adobe Systems Incorporated, Canon Information Systems, Eastman Kodak Company, Fujitsu Computer Products of America, Genoa Technology, Hewlett-Packard Company, Intel Corporation, Kofax Image Products, JFL Peripheral Solutions Inc., Ricoh Corporation, and Xerox Corporation.
- 2000 TWAIN Working Group: Adobe Systems Incorporated, Canon Information Systems, Digimarc Corporation, Eastman Kodak Company, Fujitsu Computer Products of America, Hewlett-Packard Company, JFL Peripheral Solutions Inc., Ricoh Corporation, and Xerox Corporation.
-License: TWAIN
- The file twain.h may be copied under the TWAIN License as specified at
- http://www.twain.org/license.shtm
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
.
- The TWAIN Working Group grants customer ("Customer") the worldwide,
- royalty-free, non-exclusive license to reproduce and distribute the
- software and documentation of the TWAIN toolkit ("TWAIN Toolkit"). The
- TWAIN Toolkit was designed to be used by third parties to assist them
- in becoming compliant with the TWAIN standard, but it has not been
- developed to the standards of a commercial product. Consequently, the
- TWAIN toolkit is provided AS IS without any warranty. THE TWAIN
- Working Group disclaims all warranties in the TWAIN toolkit whether
- implied, express or statutory, including, without limitation, the
- implied warranties of merchantability, noninfringement of third party
- rights and fitness for a particular purpose. The TWAIN Working Group
- disclaims all liability for damages, whether direct, indirect,
- special, incidental, or consequential, arising from the reproduction,
- distribution, modification, or other use of the TWAIN Toolkit.
+ 3. Neither the name of the copyright holder nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
.
- As a condition of this license, Customer agrees to include in software
- programs based in whole or in part on the TWAIN Toolkit the following
- providions in (i) the header or similar file in such software and (ii)
- prominently in its documentation and to require its sublicensees to
- include these provisions in similar locations: The TWAIN Toolkit is
- distributed as is. The developer and distributors of the TWAIN Toolkit
- expressly disclaim all implied, express or statutory warranties
- including, without limitation, the implied warranties of
- merchantability, noninfringement of third party rights and fitness for
- a particular purpose. Neither the developers nor the distributors will
- be liable for damages, whether direct, indirect, special, incidental,
- or consequential, as a result of the reproduction, modification,
- distribution or other use of the TWAIN Toolkit.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
-License: GPL-2+
+License: GPL-2.0-or-later
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.
+ 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, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. Also add information on how to contact you by
+ electronic and paper mail.
.
- 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'.
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in
+ `/usr/share/common-licenses/GPL-2’.
-License: LGPL-2.1
- This library 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;
- version 2.1.
+License: LGPL-2.1-only
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version
+ 2.1 as published by the Free Software Foundation.
.
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ This library 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 library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA Also add information on how to contact you by
+ electronic and paper mail.
.
- On Debian systems, the complete text of the GNU Library General Public
- License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 2.1 can be found in
+ `/usr/share/common-licenses/LGPL-2.1’.
-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.
+License: LGPL-3.0-only
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version
+ 3 as published by the Free Software Foundation.
.
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ This library 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 package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ License along with this library. If not, see
+ <http://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'.
+ Public License version 3 can be found in
+ `/usr/share/common-licenses/LGPL-3’.
+
+License: LicenseRef-KDE-Accepted-LGPL
+ This library 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 that is accepted by
+ the membership of KDE e.V. (or its successor approved by the
+ membership of KDE e.V.), which shall act as a proxy as defined in
+ Section 6 of version 3 of the license.
+ .
+ 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.
-License: KDEeV
- This file is distributed under the license LGPL either
- version 2.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
+License: CC0-1.0
+ On Debian systems, the complete text of the CC0 1.0 Universal license
+ can be found in "/usr/share/common-licenses/CC0-1.0".
diff --git a/debian/rules b/debian/rules
index 28858f7..38fa690 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,6 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
%:
dh $@ --with kf5
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index cf40c18..a63c806 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,7 +1,6 @@
-Name: libksane
-Changelog: https://cgit.kde.org/libksane.git/log
-Contact: kde-devel at kde.org
-Donation: https://www.kde.org/community/donations/index.php
-Repository: https://anongit.kde.org/libksane.git
-Repository-Browse: https://cgit.kde.org/libksane.git
+Bug-Database: https://bugs.kde.org/buglist.cgi?product=ksanecore&resolution=---
+Changelog: https://kde.org/announcements/
+Donation: https://www.kde.org/community/donations/
+Repository: https://invent.kde.org/libraries/ksanecore.git
+Repository-Browse: https://invent.kde.org/libraries/ksanecore
Security-Contact: security at kde.org
More information about the Neon-commits
mailing list