[neon/kde/kontactinterface/Neon/unstable] debian: Finish kf6ify

Scarlett Moore null at kde.org
Mon Sep 25 17:23:41 BST 2023


Git commit c1bf1df3d176f02032d5bc4d1ab87303d4380ec7 by Scarlett Moore.
Committed on 25/09/2023 at 18:23.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Finish kf6ify

D  +0    -1    debian/compat
M  +22   -17   debian/control
R  +3    -3    debian/kpim6-kontactinterface-dev.acc.in [from: debian/libkf5kontactinterface-dev.acc.in - 056% similarity]
R  +2    -2    debian/kpim6-kontactinterface-dev.install [from: debian/libkf5kontactinterface-dev.install - 053% similarity]
A  +4    -0    debian/kpim6-kontactinterface.install
R  +0    -0    debian/kpim6-kontactinterface.lintian-overrides [from: debian/libkf5kontactinterface5.lintian-overrides - 100% similarity]
R  +0    -0    debian/kpim6-kontactinterface.maintscript [from: debian/libkf5kontactinterface-data.maintscript - 100% similarity]
D  +0    -1    debian/libkf5kontactinterface-data.install
D  +0    -3    debian/libkf5kontactinterface5.install

https://invent.kde.org/neon/kde/kontactinterface/-/commit/c1bf1df3d176f02032d5bc4d1ab87303d4380ec7

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 fcfc503..874e3f7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 9),
+               debhelper-compat (= 12),
                kf6-extra-cmake-modules,
                kf6-kcoreaddons-dev,
                kf6-ki18n-dev,
@@ -19,7 +19,7 @@ Homepage: https://projects.kde.org/projects/kde/pim/kontactinterface
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kontactinterface.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kontactinterface.git
 
-Package: libkf5kontactinterface-dev
+Package: kpim6-kontactinterface-dev
 Section: libdevel
 Architecture: any
 Depends: kf6-kparts-dev,
@@ -31,24 +31,29 @@ Description: Kontact interface library - development files
  .
  This package contains the development files.
 
-Package: libkf5kontactinterface-data
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Kontact interface library - data files
- This library provides the glue necessary for application "Parts" to be
- embedded as a Kontact component (or plugin).
- .
- This package contains shared data files.
-
-Package: libkf5kontactinterface5
+Package: kpim6-kontactinterface
 Architecture: any
 Multi-Arch: same
-Depends: kpim6-kcontactinterface (= ${source:Version}),
-         ${misc:Depends},
+Depends: ${misc:Depends},
          ${shlibs:Depends}
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
 Description: Kontact interface library
  This library provides the glue necessary for application "Parts" to be
  embedded as a Kontact component (or plugin).
+
+Package: libkf6kontactinterface-dev
+Architecture: all
+Depends: kpim6-kontactinterface-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6kontactinterface-data
+Architecture: all
+Depends: kpim6-kontactinterface
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6kontactinterface6
+Architecture: all
+Depends: kpim6-kontactinterface
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/libkf5kontactinterface-dev.acc.in b/debian/kpim6-kontactinterface-dev.acc.in
similarity index 56%
rename from debian/libkf5kontactinterface-dev.acc.in
rename to debian/kpim6-kontactinterface-dev.acc.in
index 6c5c7f9..55d8dae 100644
--- a/debian/libkf5kontactinterface-dev.acc.in
+++ b/debian/kpim6-kontactinterface-dev.acc.in
@@ -6,12 +6,12 @@
 </version>
 
 <headers>
-    /usr/include/KF5/KontactInterface/
-    /usr/include/KF5/kontactinterface_version.h
+    /usr/include/Kpim6/KontactInterface/
+    /usr/include/Kpim6/kontactinterface_version.h
 </headers>
 
 <libs>
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5KontactInterface.so
+    /usr/lib/@@DEB_HOST_MULTIARCH@@/Kpim6KontactInterface.so
 </libs>
 
 <gcc_options>
diff --git a/debian/libkf5kontactinterface-dev.install b/debian/kpim6-kontactinterface-dev.install
similarity index 53%
rename from debian/libkf5kontactinterface-dev.install
rename to debian/kpim6-kontactinterface-dev.install
index 9cdaf1b..33dc84f 100644
--- a/debian/libkf5kontactinterface-dev.install
+++ b/debian/kpim6-kontactinterface-dev.install
@@ -1,4 +1,4 @@
 usr/include/KPim6/KontactInterface/
-usr/lib/*/cmake/KPim5KontactInterface/
-usr/lib/*/libKPim5KontactInterface.so
+usr/lib/*/cmake/KPim6KontactInterface/
+usr/lib/*/libKPim6KontactInterface.so
 usr/lib/*/qt6/mkspecs/modules/qt_KontactInterface.pri
diff --git a/debian/kpim6-kontactinterface.install b/debian/kpim6-kontactinterface.install
new file mode 100644
index 0000000..755ed38
--- /dev/null
+++ b/debian/kpim6-kontactinterface.install
@@ -0,0 +1,4 @@
+usr/lib/*/libKPim6KontactInterface.so.6
+usr/lib/*/libKPim6KontactInterface.so.*.*
+usr/share/locale/
+usr/share/qlogging-categories6/
diff --git a/debian/libkf5kontactinterface5.lintian-overrides b/debian/kpim6-kontactinterface.lintian-overrides
similarity index 100%
rename from debian/libkf5kontactinterface5.lintian-overrides
rename to debian/kpim6-kontactinterface.lintian-overrides
diff --git a/debian/libkf5kontactinterface-data.maintscript b/debian/kpim6-kontactinterface.maintscript
similarity index 100%
rename from debian/libkf5kontactinterface-data.maintscript
rename to debian/kpim6-kontactinterface.maintscript
diff --git a/debian/libkf5kontactinterface-data.install b/debian/libkf5kontactinterface-data.install
deleted file mode 100644
index 82ce3b1..0000000
--- a/debian/libkf5kontactinterface-data.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/qlogging-categories6/
diff --git a/debian/libkf5kontactinterface5.install b/debian/libkf5kontactinterface5.install
deleted file mode 100644
index 68135a6..0000000
--- a/debian/libkf5kontactinterface5.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libKPim5KontactInterface.so.5
-usr/lib/*/libKPim5KontactInterface.so.5.*
-usr/share/locale/


More information about the Neon-commits mailing list