[neon/kde/kdepim-runtime/Neon/unstable] debian: lint it green

Carlos De Maine null at kde.org
Wed Dec 6 01:28:38 GMT 2023


Git commit eeb01f95189321d02f7d29f2f5cb5fc183f4c1aa by Carlos De Maine.
Committed on 06/12/2023 at 02:28.
Pushed by carlosdem into branch 'Neon/unstable'.

lint it green

M  +1    -1    debian/control
M  +0    -294  debian/copyright
D  +0    -33   debian/patches/fix_etesync
D  +0    -1    debian/patches/series
M  +1    -1    debian/rules

https://invent.kde.org/neon/kde/kdepim-runtime/-/commit/eeb01f95189321d02f7d29f2f5cb5fc183f4c1aa

diff --git a/debian/control b/debian/control
index 57875e5..0eac4db 100644
--- a/debian/control
+++ b/debian/control
@@ -87,6 +87,6 @@ Description: runtime components for Akonadi KDE
 
 Package: kdepim-runtime
 Architecture: all
-Depends: kpim6-kdepim-runtime
+Depends: kpim6-kdepim-runtime, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index e7ac3b6..019916d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,300 +33,6 @@ Copyright: 2008, Bertjan Broeksema <b.broeksema at kdemail.org>
            2006-2011, Volker Krause <vkrause at kde.org>
 License: LGPL-2+
 
-Files: COPYING
-       akonadi-version.h.cmake
-       kdepim-runtime-version.h.cmake
-       resources/dav/COPYING
-       resources/dav/common/davcollection.cpp
-       resources/dav/common/davcollection.h
-       resources/dav/common/davcollectiondeletejob.cpp
-       resources/dav/common/davcollectiondeletejob.h
-       resources/dav/common/davcollectionmodifyjob.cpp
-       resources/dav/common/davcollectionmodifyjob.h
-       resources/dav/common/davcollectionsfetchjob.cpp
-       resources/dav/common/davcollectionsfetchjob.h
-       resources/dav/common/davcollectionsmultifetchjob.cpp
-       resources/dav/common/davcollectionsmultifetchjob.h
-       resources/dav/common/davitem.cpp
-       resources/dav/common/davitem.h
-       resources/dav/common/davitemcreatejob.cpp
-       resources/dav/common/davitemcreatejob.h
-       resources/dav/common/davitemdeletejob.cpp
-       resources/dav/common/davitemdeletejob.h
-       resources/dav/common/davitemfetchjob.cpp
-       resources/dav/common/davitemfetchjob.h
-       resources/dav/common/davitemmodifyjob.cpp
-       resources/dav/common/davitemmodifyjob.h
-       resources/dav/common/davitemsfetchjob.cpp
-       resources/dav/common/davitemsfetchjob.h
-       resources/dav/common/davitemslistjob.cpp
-       resources/dav/common/davitemslistjob.h
-       resources/dav/common/davjobbase.cpp
-       resources/dav/common/davjobbase.h
-       resources/dav/common/davmanager.cpp
-       resources/dav/common/davmanager.h
-       resources/dav/common/davmultigetprotocol.cpp
-       resources/dav/common/davmultigetprotocol.h
-       resources/dav/common/davprincipalhomesetsfetchjob.cpp
-       resources/dav/common/davprincipalhomesetsfetchjob.h
-       resources/dav/common/davprincipalsearchjob.cpp
-       resources/dav/common/davprincipalsearchjob.h
-       resources/dav/common/davprotocolbase.cpp
-       resources/dav/common/davprotocolbase.h
-       resources/dav/common/davutils.cpp
-       resources/dav/common/davutils.h
-       resources/dav/common/etagcache.cpp
-       resources/dav/common/etagcache.h
-       resources/dav/protocols/caldavprotocol.cpp
-       resources/dav/protocols/caldavprotocol.h
-       resources/dav/protocols/carddavprotocol.cpp
-       resources/dav/protocols/carddavprotocol.h
-       resources/dav/protocols/groupdavprotocol.cpp
-       resources/dav/protocols/groupdavprotocol.h
-       resources/dav/resource/configdialog.cpp
-       resources/dav/resource/configdialog.h
-       resources/dav/resource/davfreebusyhandler.cpp
-       resources/dav/resource/davfreebusyhandler.h
-       resources/dav/resource/davgroupwareresource.cpp
-       resources/dav/resource/davgroupwareresource.h
-       resources/dav/resource/davprotocolattribute.cpp
-       resources/dav/resource/davprotocolattribute.h
-       resources/dav/resource/searchdialog.cpp
-       resources/dav/resource/searchdialog.h
-       resources/dav/resource/settings.cpp
-       resources/dav/resource/settings.h
-       resources/dav/resource/setupwizard.cpp
-       resources/dav/resource/setupwizard.h
-       resources/dav/resource/urlconfigurationdialog.cpp
-       resources/dav/resource/urlconfigurationdialog.h
-       resources/gmail/gmailresource.cpp
-       resources/gmail/gmailresource.h
-       resources/gmail/gmailretrievecollectionstask.cpp
-       resources/gmail/gmailretrievecollectionstask.h
-       resources/gmail/gmailretrieveitemstask.cpp
-       resources/gmail/gmailretrieveitemstask.h
-       resources/gmail/gmailsettings.h
-       resources/google/common/googleaccountmanager.cpp
-       resources/google/common/googleaccountmanager.h
-       resources/imap/autotests/dummypasswordrequester.cpp
-       resources/imap/autotests/dummypasswordrequester.h
-       resources/imap/autotests/imaptestbase.cpp
-       resources/imap/autotests/imaptestbase.h
-       resources/imap/autotests/testaddcollectiontask.cpp
-       resources/imap/autotests/testadditemtask.cpp
-       resources/imap/autotests/testchangecollectiontask.cpp
-       resources/imap/autotests/testchangeitemtask.cpp
-       resources/imap/autotests/testexpungecollectiontask.cpp
-       resources/imap/autotests/testmovecollectiontask.cpp
-       resources/imap/autotests/testmoveitemstask.cpp
-       resources/imap/autotests/testremovecollectionrecursivetask.cpp
-       resources/imap/autotests/testresourcetask.cpp
-       resources/imap/autotests/testretrievecollectionmetadatatask.cpp
-       resources/imap/autotests/testretrievecollectionstask.cpp
-       resources/imap/autotests/testretrieveitemstask.cpp
-       resources/imap/autotests/testretrieveitemtask.cpp
-       resources/imap/autotests/testsessionpool.cpp
-       resources/imap/highestmodseqattribute.cpp
-       resources/imap/highestmodseqattribute.h
-       resources/imap/setupserver.cpp
-       resources/imap/setupserver.h
-       resources/imap/tests/testsubscriptiondialog.cpp
-       resources/kalarm/kalarmdir/autoqpointer.h
-       resources/kolab/tests/imaptestbase.cpp
-       resources/kolab/tests/imaptestbase.h
-       resources/kolab/tests/testchangeitemstagstask.cpp
-       resources/kolab/tests/testretrievetagstask.cpp
-       resources/mixedmaildir/kmindexreader/autotests/TestIdxReader_data.h
-       resources/mixedmaildir/kmindexreader/autotests/testidxreader.cpp
-       resources/mixedmaildir/kmindexreader/autotests/testidxreader.h
-       resources/mixedmaildir/kmindexreader/kmindexreader.cpp
-       resources/mixedmaildir/kmindexreader/kmindexreader.h
-       resources/pop3/accountdialog.cpp
-       resources/pop3/accountdialog.h
-       resources/pop3/autotests/fakeserver/fakeserver.cpp
-       resources/pop3/autotests/fakeserver/fakeserver.h
-Copyright: 2003, Andreas Gungl <a.gungl at gmx.de>
-           2010, Casey Link <unnamedrambler at gmail.com>
-           2009, Christophe Giboudeaux <cgiboudeaux at gmail.com>
-           2000-2004, Cornelius Schumacher <schumacher at kde.org>
-           2013-2014, Daniel Vrátil <dvratil at redhat.com>
-           2009, David Jarvie <djarvie at kde.org>
-           2000, Espen Sand <espen at kde.org>
-           1989-1991, Free Software Foundation, Inc
-           2006, Frode M. Døving <frode at lnix.net>
-           2005, Gilles Caulier <caulier.gilles at free.fr>
-           2009-2014, Gregory Oestreicher <greg at kamago.net>
-           2009, Kevin Ottens <ervin at kde.org>
-           2009-2010, Klaralvdalens Datakonsult AB, a KDAB Group company <info at kdab.net>
-           2010, Klarälvdalens Datakonsult AB
-           2010, Klarälvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>
-           2006-2008, Omat Holding B.V <info at omat.nl>
-           1998-1999, Preston Brown <pbrown at kde.org>
-           1996-1998, Stefan Taferner <taferner at kde.org>
-           2009, Thomas McGuire <mcguire at kde.org>
-           2010, Tobias Koenig <tokoe at kde.org>
-           2008, Volker Krause <vkrause at kde.org>
-License: GPL-2+
-
-Files: COPYING.LIB
-       resources/gmail/gmailchangeitemslabelstask.cpp
-       resources/gmail/gmailchangeitemslabelstask.h
-       resources/gmail/gmailconfigdialog.cpp
-       resources/gmail/gmailconfigdialog.h
-       resources/gmail/gmaillabelattribute.cpp
-       resources/gmail/gmaillabelattribute.h
-       resources/gmail/gmaillinkitemstask.cpp
-       resources/gmail/gmaillinkitemstask.h
-       resources/gmail/gmailmessagehelper.cpp
-       resources/gmail/gmailmessagehelper.h
-       resources/gmail/gmailpasswordrequester.cpp
-       resources/gmail/gmailpasswordrequester.h
-       resources/gmail/gmailresourcestate.cpp
-       resources/gmail/gmailresourcestate.h
-       resources/gmail/gmailsettings.cpp
-       resources/imap/batchfetcher.cpp
-       resources/imap/batchfetcher.h
-       resources/imap/noinferiorsattribute.cpp
-       resources/imap/noinferiorsattribute.h
-       resources/maildir/libmaildir/keycache.cpp
-       resources/maildir/libmaildir/keycache.h
-Copyright: 2012, Andras Mantia <amantia at kde.org>
-           2012-2014, Christian Mollekopf <mollekopf at kolabsys.com>
-           2014, Daniel Vrátil <dvratil at redhat.com>
-           1991-1999, Free Software Foundation, Inc
-License: LGPL-2.1+
-
-Files: resources/google/calendar/calendarresource.cpp
-       resources/google/calendar/calendarresource.h
-       resources/google/calendar/defaultreminderattribute.cpp
-       resources/google/calendar/defaultreminderattribute.h
-       resources/google/calendar/settings.cpp
-       resources/google/calendar/settings.h
-       resources/google/calendar/settingsdialog.cpp
-       resources/google/calendar/settingsdialog.h
-       resources/google/common/googleresource.cpp
-       resources/google/common/googleresource.h
-       resources/google/common/googlesettings.cpp
-       resources/google/common/googlesettings.h
-       resources/google/common/googlesettingsdialog.cpp
-       resources/google/common/googlesettingsdialog.h
-       resources/google/contacts/contactsresource.cpp
-       resources/google/contacts/contactsresource.h
-       resources/google/contacts/settings.cpp
-       resources/google/contacts/settings.h
-       resources/google/contacts/settingsdialog.cpp
-       resources/google/contacts/settingsdialog.h
-Copyright: 2011-2013, Dan Vratil <dan at progdan.cz>
-           2011-2013, Daniel Vrátil <dvratil at redhat.com>
-License: GPL-3+
-
-Files: agents/migration/autotests/dummymigrator.cpp
-       agents/migration/autotests/dummymigrator.h
-       agents/migration/autotests/schedulertest.cpp
-       agents/migration/migrationagent.cpp
-       agents/migration/migrationagent.h
-       agents/migration/migrationexecutor.cpp
-       agents/migration/migrationexecutor.h
-       agents/migration/migrationscheduler.cpp
-       agents/migration/migrationscheduler.h
-       agents/migration/migrationstatuswidget.cpp
-       agents/migration/migrationstatuswidget.h
-       migration/migratorbase.cpp
-       migration/migratorbase.h
-       resources/imap/searchtask.cpp
-       resources/imap/searchtask.h
-Copyright: 2013, Christian Mollekopf <mollekopf at kolabsys.com>
-           2013, Daniel Vrátil <dvratil at redhat.com>
-License: GPL-2+3+KDEeV
-
-Files: agents/newmailnotifier/newmailnotifiershowmessagejob.cpp
-       agents/newmailnotifier/newmailnotifiershowmessagejob.h
-       agents/newmailnotifier/specialnotifierjob.cpp
-       agents/newmailnotifier/specialnotifierjob.h
-       resources/folderarchivesettings/autotests/folderarchiveaccountinfotest.cpp
-       resources/folderarchivesettings/autotests/folderarchiveaccountinfotest.h
-       resources/folderarchivesettings/folderarchiveaccountinfo.cpp
-       resources/folderarchivesettings/folderarchiveaccountinfo.h
-       resources/folderarchivesettings/folderarchivesettingpage.cpp
-       resources/folderarchivesettings/folderarchivesettingpage.h
-       resources/folderarchivesettings/folderarchiveutil.cpp
-       resources/folderarchivesettings/folderarchiveutil.h
-       resources/mbox/autotests/deleteitemsattributetest.cpp
-       resources/mbox/autotests/deleteitemsattributetest.h
-Copyright: 2013-2015, Montel Laurent <montel at kde.org>
-License: GPL-2
-
-Files: resources/pop3/autotests/pop3test.cpp
-       resources/pop3/autotests/pop3test.h
-       resources/pop3/jobs.cpp
-       resources/pop3/jobs.h
-       resources/pop3/metatype.h
-       resources/pop3/pop3resource.cpp
-       resources/pop3/pop3resource.h
-       resources/pop3/settings.cpp
-       resources/pop3/settings.h
-Copyright: 2009-2010, Thomas McGuire <mcguire at kde.org>
-License: LGPL-2+3+KDEeV
-
-Files: resources/maildir/libmaildir/autotests/testmaildir.cpp
-       resources/shared/singlefileresource/getcredentialsjob.cpp
-       resources/shared/singlefileresource/getcredentialsjob.h
-Copyright: 2013, Alejandro Fiestas Olivares <afiestas at kde.org>
-           2007, Till Adam <adam at kde.org>
-License: LGPL-2
-
-Files: resources/gmail/saslplugin/config.h
-       resources/gmail/saslplugin/plugin_common.c
-       resources/gmail/saslplugin/plugin_common.h
-Copyright: 1998-2003, Carnegie Mellon University
-License: BSD_like_CMU-4-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.
- .
- 3. The name "Carnegie Mellon University" must not be used to
-    endorse or promote products derived from this software without
-    prior written permission. For permission or any other legal
-    details, please contact
-      Office of Technology Transfer
-      Carnegie Mellon University
-      5000 Forbes Avenue
-      Pittsburgh, PA  15213-3890
-      (412) 268-4387, fax: (412) 268-7395
-      tech-transfer at andrew.cmu.edu
- .
- 4. Redistributions of any form whatsoever must retain the following
-    acknowledgment:
-    "This product includes software developed by Computing Services
-     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- .
- CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Files: doc/pics/akonadi_agent_handling.eps
-       doc/pics/akonadi_client_search.eps
-Copyright: 2003, Bitstream, Inc
-           1994-2005, Trolltech
-License: QT_Prolog
- You may copy this prolog in any way that is directly related to this
- document. For other use of this prolog, see your licensing agreement for Qt.
- .
- The complete copyright information of qt5 can be found in
- `/usr/share/doc/libqt5gui5/copyright'.
-
 Files: debian/*
 Copyright: 2009, Sune Vuorela <debian at pusling.com>
 License: LGPL-2+
diff --git a/debian/patches/fix_etesync b/debian/patches/fix_etesync
deleted file mode 100644
index 95cd4f8..0000000
--- a/debian/patches/fix_etesync
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
-index 299f404b0cd983cfe7fa57603077726e5a4485af..7d564273bf837952f9f3c1f676a76022883196a5 100644
---- a/resources/CMakeLists.txt
-+++ b/resources/CMakeLists.txt
-@@ -5,6 +5,7 @@ set_package_properties(Libkolabxml PROPERTIES DESCRIPTION "Kolabxml" URL "http:/
- # Etebase library
- find_package(Etebase CONFIG)
- set_package_properties(Etebase PROPERTIES URL "https://github.com/etesync/libetebase/releases" TYPE OPTIONAL PURPOSE "The Etebase library is required to build the EteSync Groupware Resource")
-+find_package(Qt6Concurrent ${QT_REQUIRED_VERSION} CONFIG)
- 
- include_directories(
-   ${CMAKE_CURRENT_SOURCE_DIR}/shared/singlefileresource/
-@@ -49,7 +50,7 @@ if (Libkolabxml_FOUND)
-     add_subdirectory( kolab )
- endif()
- 
--if (Etebase_FOUND)
-+if (Etebase_FOUND AND Qt6Concurrent_FOUND)
-     add_subdirectory( etesync )
- endif()
- 
-diff --git a/resources/etesync/CMakeLists.txt b/resources/etesync/CMakeLists.txt
-index 6a233f09b18d13108ddb72e99a8821c54c26c672..f540897127c05a21b520cbbdc5f5c55a2df03dfb 100644
---- a/resources/etesync/CMakeLists.txt
-+++ b/resources/etesync/CMakeLists.txt
-@@ -51,6 +51,7 @@ if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
- endif()
- target_link_libraries(akonadi_etesync_resource
-     ${ETEBASE_LIBRARIES}
-+    Qt::Concurrent
-     Qt::DBus
-     KPim6::AkonadiAgentBase
-     KF6::ConfigCore
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9983143..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-#fix_etesync
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 081221b..d9b88f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,4 +7,4 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DCOMPILE_WITH_UNITY_CMAKE_SUPPORT=ON
\ No newline at end of file
+		-DCOMPILE_WITH_UNITY_CMAKE_SUPPORT=ON


More information about the Neon-commits mailing list