[neon/kde/akonadi-notes/Neon/unstable] debian: kf6ify

Scarlett Moore null at kde.org
Fri Sep 22 15:45:18 BST 2023


Git commit 8df7ae7f2a272dc8caba9041013899cd3e6eb4f5 by Scarlett Moore.
Committed on 22/09/2023 at 16:45.
Pushed by scarlettmoore into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +23   -18   debian/control
A  +4    -0    debian/kpim6-akonadinotes-dev.install
A  +3    -0    debian/kpim6-akonadinotes.install
A  +1    -0    debian/kpim6-akonadinotes.lintian-overrides
R  +0    -0    debian/kpim6-akonadinotes.symbols [from: debian/libkf5akonadinotes5.symbols - 100% similarity]
D  +0    -5    debian/libkf5akonadinotes-dev.install
D  +0    -3    debian/libkf5akonadinotes5.install
D  +0    -1    debian/libkf5akonadinotes5.lintian-overrides
M  +2    -4    debian/rules

https://invent.kde.org/neon/kde/akonadi-notes/-/commit/8df7ae7f2a272dc8caba9041013899cd3e6eb4f5

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 4ecae82..9833f8a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,26 +9,26 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
            Maximiliano Curia <maxy at debian.org>,
 Build-Depends: cmake (>= 3.0~),
-               debhelper (>= 11),
-               extra-cmake-modules (>= 5.47.0~),
-               libkf5akonadi-dev (>= 4:18.08.3~),
-               libkf5i18n-dev (>= 5.47.0~),
-               libkf5mime-dev (>= 18.08.3~),
+               debhelper-compat (= 12),
+               kf6-extra-cmake-modules,
+               kpim6-akonadi-dev,
+               kf6-ki18n-dev,
+               kpim6-kmime-dev,
                pkg-config,
                pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.9.0~),
+               qt6-base-dev,
 Standards-Version: 4.3.0
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/akonadi-notes
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/akonadi-notes.git
 
-Package: libkf5akonadinotes-dev
+Package: kpim6-akonadinotes-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkf5akonadi-dev (>= 4:18.08.3~),
-         libkf5akonadinotes5 (= ${binary:Version}),
-         libkf5mime-dev (>= 18.08.3~),
+Depends: kpim6-akonadi-dev,
+         kpim6-akonadinotes (= ${binary:Version}),
+         kpim6-kmime-dev,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Akonadi notes access library - development files
@@ -39,19 +39,24 @@ Description: Akonadi notes access library - development files
  .
  This package contains the development files.
 
-Package: libkf5akonadinotes5
+Package: libkf6akonadinotes-dev
+Architecture: all
+Depends: kpim6-akonadinotes-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: kpim6-akonadinotes
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kdepim-addons (<< 17.08),
-        kdepim-runtime (<< 4:17.08),
-        knotes (<< 4:17.08),
-        korganizer (<< 4:17.08),
-        libkf5messageviewer5 (<< 4:17.08),
-        ${kde-l10n:all},
-Replaces: ${kde-l10n:all}
 Description: Akonadi notes access library
  This library provides notes manipulation helpers using the
  Akonadi PIM data server.
  .
  This package is part of the KDE Development Platform PIM libraries module.
+
+Package: libkf6akonadinotes6
+Architecture: all
+Depends: kpim6-akonadinotes
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/kpim6-akonadinotes-dev.install b/debian/kpim6-akonadinotes-dev.install
new file mode 100644
index 0000000..65f977a
--- /dev/null
+++ b/debian/kpim6-akonadinotes-dev.install
@@ -0,0 +1,4 @@
+usr/include/
+usr/lib/*/cmake/KPim6AkonadiNotes/
+usr/lib/*/libKPim6AkonadiNotes.so
+usr/lib/*/qt6/mkspecs/modules/qt_AkonadiNotes.pri
diff --git a/debian/kpim6-akonadinotes.install b/debian/kpim6-akonadinotes.install
new file mode 100644
index 0000000..0ac0a2a
--- /dev/null
+++ b/debian/kpim6-akonadinotes.install
@@ -0,0 +1,3 @@
+usr/lib/*/libKPim6AkonadiNotes.so.6
+usr/lib/*/libKPim6AkonadiNotes.so.*.*
+usr/share/locale/
diff --git a/debian/kpim6-akonadinotes.lintian-overrides b/debian/kpim6-akonadinotes.lintian-overrides
new file mode 100644
index 0000000..038a1ac
--- /dev/null
+++ b/debian/kpim6-akonadinotes.lintian-overrides
@@ -0,0 +1 @@
+kpim6-akonadinotes: package-name-doesnt-match-sonames libKPim6AkonadiNotes6
diff --git a/debian/libkf5akonadinotes5.symbols b/debian/kpim6-akonadinotes.symbols
similarity index 100%
rename from debian/libkf5akonadinotes5.symbols
rename to debian/kpim6-akonadinotes.symbols
diff --git a/debian/libkf5akonadinotes-dev.install b/debian/libkf5akonadinotes-dev.install
deleted file mode 100644
index e13638a..0000000
--- a/debian/libkf5akonadinotes-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/
-usr/lib/*/cmake/KF5AkonadiNotes/
-usr/lib/*/cmake/KPim5AkonadiNotes/
-usr/lib/*/libKPim5AkonadiNotes.so
-usr/lib/*/qt5/mkspecs/modules/qt_AkonadiNotes.pri
diff --git a/debian/libkf5akonadinotes5.install b/debian/libkf5akonadinotes5.install
deleted file mode 100644
index af5f5c9..0000000
--- a/debian/libkf5akonadinotes5.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libKPim5AkonadiNotes.so.5
-usr/lib/*/libKPim5AkonadiNotes.so.5.*
-usr/share/locale/
diff --git a/debian/libkf5akonadinotes5.lintian-overrides b/debian/libkf5akonadinotes5.lintian-overrides
deleted file mode 100644
index 8c24cf2..0000000
--- a/debian/libkf5akonadinotes5.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkf5akonadinotes5: package-name-doesnt-match-sonames libKPim5AkonadiNotes5
diff --git a/debian/rules b/debian/rules
index c8b9fc3..19d8784 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
 
-l10npkgs_firstversion_ok := 4:16.04.3-9~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
+%:
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list