[neon/kf6/kdav/Neon/unstable] debian: kf sixy

Jonathan Esk-Riddell null at kde.org
Wed Jan 25 16:56:59 GMT 2023


Git commit f0afb73e0bfe58a2c64b97268df89ad58d99aab1 by Jonathan Esk-Riddell.
Committed on 25/01/2023 at 16:56.
Pushed by jriddell into branch 'Neon/unstable'.

kf sixy

M  +2    -352  debian/changelog
D  +0    -1    debian/compat
M  +35   -36   debian/control
A  +4    -0    debian/kf6-kdav-dev.install
A  +4    -0    debian/kf6-kdav.install
D  +0    -2    debian/libkf5dav-data.install
D  +0    -4    debian/libkf5dav-dev.install
D  +0    -2    debian/libkf5dav5.install
D  +0    -1    debian/libkf5dav5.maintscript
M  +5    -3    debian/rules

https://invent.kde.org/neon/kf6/kdav/commit/f0afb73e0bfe58a2c64b97268df89ad58d99aab1

diff --git a/debian/changelog b/debian/changelog
index 9332277..0a5bd6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,355 +1,5 @@
-kdav (1:5.92.0-0neon) focal; urgency=medium
+kf6-kdav (0.0-0neon) UNRELEASED; urgency=medium
 
   * New release
 
- -- Neon CI <neon at kde.org>  Tue, 15 Mar 2022 13:23:38 +0000
-
-kdav (1:5.91.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 11 Jan 2022 15:08:23 +0000
-
-kdav (1:5.89.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 11 Dec 2021 10:27:18 +0000
-
-kdav (1:5.88.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 15 Nov 2021 21:55:31 +0000
-
-kdav (1:5.87.0-0neon) focal; urgency=medium
-
-  [ Jonathan Riddell ]
-  * new release
-
-  [ Neon CI ]
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 02 Oct 2021 23:54:06 +0000
-
-kdav (1:5.85.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sun, 15 Aug 2021 10:08:13 +0000
-
-kdav (1:5.84.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 12 Jul 2021 12:17:46 +0000
-
-kdav (1:5.83.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 11 Jun 2021 21:25:00 +0000
-
-kdav (1:5.82.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 11 May 2021 10:15:23 +0000
-
-kdav (1:5.81.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sun, 11 Apr 2021 18:08:48 +0000
-
-kdav (1:5.80.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sun, 14 Mar 2021 14:10:34 +0000
-
-kdav (1:5.79.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 11 Feb 2021 13:57:06 +0000
-
-kdav (1:5.78.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 09 Jan 2021 12:10:06 +0000
-
-kdav (1:5.77.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sat, 12 Dec 2020 14:04:08 +0000
-
-kdav (1:5.76.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 19 Nov 2020 11:29:45 +0000
-
-kdav (1:5.75.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 09 Oct 2020 13:40:06 +0000
-
-kdav (1:5.74.0-0neon) focal; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 10 Sep 2020 13:22:49 +0000
-
-kdav (1:5.73.0-0neon) bionic; urgency=medium
-
-  [ Jonathan Riddell ]
-  * New release in frameworks
-
-  [ Neon CI ]
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 17 Aug 2020 19:13:32 +0000
-
-kdav (20.04.3-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 09 Jul 2020 09:38:24 +0000
-
-kdav (20.04.2-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Sun, 17 May 2020 22:23:19 +0000
-
-kdav (20.04.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 21 Apr 2020 17:46:20 +0000
-
-kdav (19.12.3-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 04 Mar 2020 10:57:39 +0000
-
-kdav (19.12.2-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 05 Feb 2020 13:45:07 +0000
-
-kdav (19.12.1-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 08 Jan 2020 17:15:13 +0000
-
-kdav (19.12.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 10 Dec 2019 18:52:07 +0000
-
-kdav (19.08.3-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 06 Nov 2019 10:11:16 +0000
-
-kdav (19.08.2-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 09 Oct 2019 18:08:16 +0000
-
-kdav (19.08.1-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 05 Sep 2019 14:22:26 +0000
-
-kdav (19.08.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 13 Aug 2019 13:19:55 +0000
-
-kdav (19.04.3-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 10 Jul 2019 11:34:56 +0000
-
-kdav (19.04.2-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 06 Jun 2019 09:59:56 +0000
-
-kdav (19.04.1-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 09 May 2019 06:39:25 +0000
-
-kdav (19.04.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 15 Apr 2019 14:10:33 +0000
-
-kdav (18.12.3-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 06 Mar 2019 15:02:04 +0000
-
-kdav (18.12.2-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 08 Feb 2019 10:59:34 +0000
-
-kdav (18.12.1-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 09 Jan 2019 13:20:07 +0000
-
-kdav (18.12.0-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 13 Dec 2018 15:43:55 +0000
-
-kdav (18.08.3-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 07 Nov 2018 19:36:10 +0000
-
-kdav (18.08.2-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 10 Oct 2018 21:34:45 +0000
-
-kdav (18.08.1-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 05 Sep 2018 13:31:23 +0000
-
-kdav (18.08.0-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Fri, 17 Aug 2018 12:35:03 +0000
-
-kdav (18.04.3-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 16 Jul 2018 14:06:23 +0000
-
-kdav (18.04.2-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 06 Jun 2018 13:05:45 +0000
-
-kdav (18.04.1-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 09 May 2018 10:30:34 +0000
-
-kdav (18.04.0-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 19 Apr 2018 14:52:24 +0000
-
-kdav (17.12.3-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Mon, 12 Mar 2018 15:10:01 +0000
-
-kdav (17.12.2-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 07 Feb 2018 17:33:01 +0000
-
-kdav (17.12.1-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 10 Jan 2018 18:23:21 +0000
-
-kdav (17.12.0-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 13 Dec 2017 14:27:16 +0000
-
-kdav (17.08.3-0neon) bionic; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 08 Nov 2017 10:56:54 +0000
-
-kdav (17.08.2-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 12 Oct 2017 12:13:54 +0000
-
-kdav (17.08.1-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 05 Sep 2017 13:59:42 +0000
-
-kdav (17.08.0-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 17 Aug 2017 09:34:15 +0000
-
-kdav (17.04.3-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 12 Jul 2017 10:19:48 +0000
-
-kdav (17.04.2-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 07 Jun 2017 12:20:54 +0000
-
-kdav (17.04.1-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Thu, 11 May 2017 18:14:25 +0000
-
-kdav (17.04.0-0neon) xenial; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 19 Apr 2017 13:03:21 +0000
-
-kdav (0.0-0neon) UNRELEASED; urgency=medium
-
-  * Initial package
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 20 Jan 2017 17:14:18 +0000
+ -- Jonathan Esk-Riddell <jr at jriddell.org>  Mon, 12 Dec 2022 13:04:30 +0000
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 0b90ffd..42a6aea 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,24 @@
-Source: kdav
+Source: kf6-kdav
 Section: libs
 Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 9),
-               extra-cmake-modules (>= 5.23.0~),
-               libkf5coreaddons-dev,
-               libkf5kio-dev,
-               libqt5xmlpatterns5-dev,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev
+Maintainer: Jonathan Esk-Riddell <jr at jriddell.org>
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kcoreaddons-dev,
+               kf6-kkio-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 4.4.1
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdav
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kdav.git
 
-Package: libkf5dav-data
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: libkpimkdav-data, libkpimkdav5
-Breaks: libkpimkdav-data, libkpimkdav5
+Package: kf6-kdav
+Architecture: any
+Section: kde
+X-Neon-MergedPackage: true
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: DAV protocol implementation with KJobs - arch independent files
  A DAV protocol implementation with KJobs.
  .
@@ -27,30 +26,30 @@ Description: DAV protocol implementation with KJobs - arch independent files
  .
  KDav is part of the KDE PIM module.
 
-Package: libkf5dav-dev
-Section: libdevel
+Package: kf6-kdav-dev
 Architecture: any
-Multi-Arch: same
-Depends: libkf5coreaddons-dev,
-         libkf5dav5 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: libkpimkdav-dev
-Replaces: libkpimkdav-dev
+Section: kde
+X-Neon-MergedPackage: true
+Depends: kf6-kdav (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: DAV protocol implementation with KJobs - developer files
  A DAV protocol implementation with KJobs.
  .
  This package is part of the KDE PIM module.
 
-Package: libkf5dav5
-Architecture: any
-Multi-Arch: same
-Depends: libkf5dav-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: libkpimkdav-data (<< 17.04.0), libkpimkdav5
-Replaces: libkpimkdav-data (<< 17.04.0), libkpimkdav5
-Description: DAV protocol implementation with KJobs
- A DAV protocol implementation with KJobs.
- .
- This package is part of the KDE PIM module.
+Package: libkf6dav-data
+Architecture: all
+Depends: kf6-kdav
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6dav6
+Architecture: all
+Depends: kf6-kdav
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6dav-dev
+Architecture: all
+Depends: kf6-kdav-dev
+Description: Dummy transitional
+  Transitional dummy package.
diff --git a/debian/kf6-kdav-dev.install b/debian/kf6-kdav-dev.install
new file mode 100644
index 0000000..78547bd
--- /dev/null
+++ b/debian/kf6-kdav-dev.install
@@ -0,0 +1,4 @@
+usr/kf6/include/KF6/
+usr/kf6/lib/*/cmake/KF5DAV/
+usr/kf6/lib/*/libKF5DAV.so
+usr/kf6/lib/*/mkspecs/modules/*
diff --git a/debian/kf6-kdav.install b/debian/kf6-kdav.install
new file mode 100644
index 0000000..eac73e3
--- /dev/null
+++ b/debian/kf6-kdav.install
@@ -0,0 +1,4 @@
+usr/kf6/lib/*/libKF5DAV.so.5
+usr/kf6/lib/*/libKF5DAV.so.5.*
+usr/kf6/share/locale/*/LC_MESSAGES/*
+usr/kf6/share/qlogging-categories6/
diff --git a/debian/libkf5dav-data.install b/debian/libkf5dav-data.install
deleted file mode 100644
index 4336c25..0000000
--- a/debian/libkf5dav-data.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/locale/*/LC_MESSAGES/*
-usr/share/qlogging-categories5/
diff --git a/debian/libkf5dav-dev.install b/debian/libkf5dav-dev.install
deleted file mode 100644
index 73d0071..0000000
--- a/debian/libkf5dav-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/KF5/
-usr/lib/*/cmake/KF5DAV/
-usr/lib/*/libKF5DAV.so
-usr/lib/*/qt5/mkspecs/modules/*
diff --git a/debian/libkf5dav5.install b/debian/libkf5dav5.install
deleted file mode 100644
index 2a62bfc..0000000
--- a/debian/libkf5dav5.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKF5DAV.so.5
-usr/lib/*/libKF5DAV.so.5.*
diff --git a/debian/libkf5dav5.maintscript b/debian/libkf5dav5.maintscript
deleted file mode 100644
index dd79030..0000000
--- a/debian/libkf5dav5.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-rm_conffile /etc/xdg/kdav.categories
diff --git a/debian/rules b/debian/rules
index e381573..fa0af1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+%:
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_auto_test:
-	true
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/


More information about the Neon-commits mailing list