[neon/kde/akonadi-contacts/Neon/unstable] debian: lints

Carlos De Maine null at kde.org
Mon Nov 27 20:57:29 GMT 2023


Git commit 13cf323c6a2519d5dab80d47458a222a365ac340 by Carlos De Maine.
Committed on 27/11/2023 at 21:57.
Pushed by carlosdem into branch 'Neon/unstable'.

lints

D  +0    -1    debian/.gitattributes
D  +0    -1    debian/.gitignore
M  +2    -2    debian/changelog
M  +38   -5    debian/control
M  +0    -9    debian/copyright
M  +1    -1    debian/rules

https://invent.kde.org/neon/kde/akonadi-contacts/-/commit/13cf323c6a2519d5dab80d47458a222a365ac340

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/.gitignore b/debian/.gitignore
deleted file mode 100644
index 027271b..0000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-files
diff --git a/debian/changelog b/debian/changelog
index e292e5e..66a8925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -158,7 +158,7 @@ akonadi-contacts (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-contacts (4:21.04.3-0neon) focal; urgency=medium
 
@@ -200,7 +200,7 @@ akonadi-contacts (4:20.12.1-0neon) focal; urgency=medium
 
   * New release
 
- -- Neon CI <neon at kde.org>  Thu, 07 Jan 2021.12.20:52 +0000
+ -- Neon CI <neon at kde.org>  Thu, 07 Jan 2021 12:20:52 +0000
 
 akonadi-contacts (4:20.12.0-0neon) focal; urgency=medium
 
diff --git a/debian/control b/debian/control
index 4477f06..48a0e88 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,11 @@ Architecture: any
 X-Neon-MergedPackage: true
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: akonadi-contacts-data, 
+          libkf6akonadicontact6,
+          libkf6contacteditor5,
+          libkf5akonadicontact5,
+          libkf5contacteditor5,
 Description: Akonadi contacts access library - data files
  This library provides contacts manipulation helpers using the
  Akonadi PIM data server.
@@ -65,6 +70,10 @@ Depends: kf6-kcolorscheme-dev,
          kpim6-akonadi-dev,
          kpim6-grantleetheme-dev,
          ${misc:Depends}
+Provides: libkf6akonadicontact-dev,
+          libkf6contacteditor-dev,
+          libkf5akonadicontact-dev,
+          libkf5contacteditor-dev,
 Description: Akonadi contacts access library - development files
  This library provides contacts manipulation helpers using the
  Akonadi PIM data server.
@@ -75,30 +84,54 @@ Description: Akonadi contacts access library - development files
 
 Package: akonadi-contacts-data
 Architecture: all
-Depends: kpim6-akonadi-contacts
+Depends: kpim6-akonadi-contacts, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6akonadicontact-dev
 Architecture: all
-Depends: kpim6-akonadi-contacts-dev
+Depends: kpim6-akonadi-contacts-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6akonadicontact6
 Architecture: all
-Depends: kpim6-akonadi-contacts
+Depends: kpim6-akonadi-contacts, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6contacteditor-dev
 Architecture: all
-Depends: kpim6-akonadi-contacts-dev
+Depends: kpim6-akonadi-contacts-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6contacteditor6
 Architecture: all
-Depends: kpim6-akonadi-contacts
+Depends: kpim6-akonadi-contacts, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
+
+Package: libkf5akonadicontact-dev
+Architecture: all
+Depends: kpim6-akonadi-contacts-dev, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5akonadicontact5
+Architecture: all
+Depends: kpim6-akonadi-contacts, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5contacteditor-dev
+Architecture: all
+Depends: kpim6-akonadi-contacts-dev, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5contacteditor5
+Architecture: all
+Depends: kpim6-akonadi-contacts, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
\ No newline at end of file
diff --git a/debian/copyright b/debian/copyright
index 119bd97..dd40d31 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,15 +41,6 @@ Files: po/ca/*
 Copyright: 2009-2017, This_file_is_part_of_KDE
 License: LGPL-2.1+3+KDEeV
 
-Files: src/contact-editor/editor/widgets/kwidgetlister.cpp
-       src/contact-editor/editor/widgets/kwidgetlister_p.h
-Copyright: 2001, Marc Mutz <mutz at kde.org>
-License: GPL-2
-
-Files: src/contact-editor/editor/data/*
-Copyright: No copyright claimed
-License: public-domain
-
 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
diff --git a/debian/rules b/debian/rules
index 141287f..7ff1376 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,4 +8,4 @@
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DCOMPILE_WITH_UNITY_CMAKE_SUPPORT=ON \
-		-DBUILD_QCH=ON
\ No newline at end of file
+		-DBUILD_QCH=ON


More information about the Neon-commits mailing list