[neon/kde/akonadi/Neon/release] debian: Move to debhelper compat. Refresh copyright, fix changelog entries.
Scarlett Moore
null at kde.org
Fri Oct 20 11:49:09 BST 2023
Git commit 1e4f633a73bf15d3c49f3f21cc2c7f6b2cb1d9af by Scarlett Moore.
Committed on 20/10/2023 at 12:48.
Pushed by scarlettmoore into branch 'Neon/release'.
Move to debhelper compat. Refresh copyright, fix changelog entries.
M +4 -4 debian/changelog
D +0 -1 debian/compat
M +1 -1 debian/control
M +7 -55 debian/copyright
https://invent.kde.org/neon/kde/akonadi/-/commit/1e4f633a73bf15d3c49f3f21cc2c7f6b2cb1d9af
diff --git a/debian/changelog b/debian/changelog
index f6e9127..47045f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -134,7 +134,7 @@ akonadi (4:21.12.0-0neon) focal; urgency=medium
* New release
- -- Neon CI <neon at kde.org> Thu, 04 Nov 2021.12.22:05 +0000
+ -- Neon CI <neon at kde.org> Thu, 04 Nov 2021 12:22:05 +0000
akonadi (4:21.08.2-0neon) focal; urgency=medium
@@ -152,7 +152,7 @@ akonadi (4:21.08.0-0neon) focal; urgency=medium
* New release
- -- Neon CI <neon at kde.org> Tue, 10 Aug 2021.12.26:16 +0000
+ -- Neon CI <neon at kde.org> Tue, 10 Aug 2021 12:26:16 +0000
akonadi (4:21.04.3-0neon) focal; urgency=medium
@@ -194,7 +194,7 @@ akonadi (4:20.12.1-0neon) focal; urgency=medium
* New release
- -- Neon CI <neon at kde.org> Thu, 07 Jan 2021.12.21:26 +0000
+ -- Neon CI <neon at kde.org> Thu, 07 Jan 2021 12:21:26 +0000
akonadi (4:20.12.0-0neon) focal; urgency=medium
@@ -1636,7 +1636,7 @@ akonadi (1.3.1-0ubuntu2) lucid; urgency=low
resolveip, an executable that is currently shipped in the main server
package.
- -- Harald Sitter <apachelogger at ubuntu.com> Wed, 31 Mar 2010 22.08.33 +0200
+ -- Harald Sitter <apachelogger at ubuntu.com> Wed, 31 Mar 2010 22:08:33 +0200
akonadi (1.3.1-0ubuntu1) lucid; urgency=low
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 6268fba..a92744c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
Modestas Vainius <modax at debian.org>,
Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 3.0~),
- debhelper (>= 11),
+ debhelper-compat (= 12),
dh-apparmor,
extra-cmake-modules (>= 5.47.0~),
kdesignerplugin (>= 5.39.0~),
diff --git a/debian/copyright b/debian/copyright
index 9c02a36..5e0d098 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,10 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Akonadi
-Source: http://download.kde.org/stable/akonadi/src/
+Upstream-Name: akonadi
+Source: https://invent.kde.org/pim/akonadi
Comment:
This package was debianized by Sune Vuorela <debian at pusling.com>
on Fri, 24 april 2008 09:49:34 +0200.
+Upstream-Contact: kde-devel at kde.org
Files: *
Copyright: 2009, Andras Mantia <amantia at kde.org>
@@ -14,9 +15,8 @@ Copyright: 2009, Andras Mantia <amantia at kde.org>
2013-2014, Christian Mollekopf <mollekopf at kolabsys.com>
2007, Christian Schaarschmidt <schaarsc at gmx.de>
2009, Constantin Berzan <exit3219 at gmail.com>
- 2014-2018, Daniel Vrátil <dvratil at kde.org>
+ 2014-2019, Daniel Vrátil <dvratil at kde.org>
2013-2016, David Faure <faure at kde.org>
- 2016, David Faure <faure at kde.org>s
2002, Holger Freyther <freyther at kde.org>
2009, Igor Trindade Oliveira <igor_trindade at yahoo.com.br>
2006-2008, Ingo Klöcker <kloecker at kde.org>
@@ -32,12 +32,12 @@ Copyright: 2009, Andras Mantia <amantia at kde.org>
2010, Milian Wolff <mail at milianw.de>
2008, Omat Holding B.V <info at omat.nl>
2007, Robert Zwerus <arzie at dds.nl>
- 2010, Rosetta Contributors and Canonical Ltd 2010
+ 2010, Rosetta Contributors and Canonical Ltd
2015-2016, Sandro Knauß <knauss at kde.org>
2010, Sebastian Trueg <trueg at kde.org>
2008-2011, Stephen Kelly <steveire at gmail.com>
2009, Szymon Stefanek <s.stefanek at gmail.com>
- 2008-2016, This_file_is_part_of_KDE
+ 2008-2019, This_file_is_part_of_KDE
2009, Thomas McGuire <mcguire at kde.org>
2008, Thomas McGuire <thomas.mcguire at gmx.net>
2006-2010, Till Adam <adam at kde.org>
@@ -52,8 +52,7 @@ License: LGPL-2+
Comment:
See full list of contributors in "AUTHORS" file.
-Files: COPYING.LIB
- autotests/akonadicontrol/agenttypetest.cpp
+Files: autotests/akonadicontrol/agenttypetest.cpp
autotests/libs/testrunner/config.cpp
autotests/libs/testrunner/config.h
autotests/libs/testrunner/main.cpp
@@ -89,8 +88,6 @@ Files: COPYING.LIB
src/private/instance_p.h
src/server/commandcontext.cpp
src/server/commandcontext.h
- src/server/handler/searchresult.cpp
- src/server/handler/searchresult.h
src/server/storage/collectionstatistics.cpp
src/server/storage/collectionstatistics.h
src/server/storage/partstreamer.cpp
@@ -129,15 +126,6 @@ Files: po/ca/*
Copyright: 2009-2017, KDE e.V
License: LGPL-2.1+3+KDEeV
-Files: autotests/libs/newmailnotifierattributetest.cpp
- autotests/libs/newmailnotifierattributetest.h
- autotests/libs/pop3resourceattributetest.cpp
- autotests/libs/pop3resourceattributetest.h
- autotests/libs/tagselectwidgettest.cpp
- autotests/libs/tagselectwidgettest.h
-Copyright: 2014-2018, Montel Laurent <montel at kde.org>
-License: GPL-2
-
Files: autotests/libs/collectioncreatetest.cpp
autotests/libs/collectionmodifytest.cpp
autotests/libs/tagmodeltest.cpp
@@ -171,10 +159,6 @@ Copyright: 2013, Digia Plc and/or its subsidiary(-ies)
2013, Olivier Goffart <ogoffart at woboq.com>
License: GPL-3_or_LGPL-2.1-QTexception-1.1
-Files: cmake/modules/FindASan.cmake
-Copyright: 2013, Matthew Arsenault
-License: Expat
-
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -199,38 +183,6 @@ License: BSD-3-clause
(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: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
-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, version 2, as
- published by the Free Software Foundation.
- .
- 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.
- .
- The complete text of the GNU General Public License version 2 can be found in
- `/usr/share/common-licenses/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
More information about the Neon-commits
mailing list