[neon/kde/kontactinterface/Neon/unstable] debian: linty, linty
Carlos De Maine
null at kde.org
Wed Nov 29 11:13:29 GMT 2023
Git commit 0914957950467479c5cfeebe7065b32fa9eae88d by Carlos De Maine.
Committed on 29/11/2023 at 12:13.
Pushed by carlosdem into branch 'Neon/unstable'.
linty, linty
M +1 -1 debian/changelog
M +56 -16 debian/control
D +0 -22 debian/kpim6-kontactinterface-dev.acc.in
M +1 -1 debian/kpim6-kontactinterface.lintian-overrides
D +0 -2 debian/kpim6-kontactinterface.maintscript
D +0 -1 debian/lintian-overrides
D +0 -18 debian/tests/acc
D +0 -0 debian/tests/control
D +0 -3 debian/tests/testsuite
https://invent.kde.org/neon/kde/kontactinterface/-/commit/0914957950467479c5cfeebe7065b32fa9eae88d
diff --git a/debian/changelog b/debian/changelog
index 4a2c1c5..3aa6a14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -188,7 +188,7 @@ kontactinterface (20.12.1-0neon) focal; urgency=medium
* New release
- -- Neon CI <neon at kde.org> Thu, 07 Jan 2021.12.29:40 +0000
+ -- Neon CI <neon at kde.org> Thu, 07 Jan 2021 12:29:40 +0000
kontactinterface (20.12.0-0neon) focal; urgency=medium
diff --git a/debian/control b/debian/control
index 2f20c7c..13536e1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
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-compat (= 12),
+Build-Depends: cmake,
+ debhelper-compat (= 13),
kf6-extra-cmake-modules,
kf6-kcolorscheme-dev,
kf6-kcoreaddons-dev,
@@ -16,14 +16,24 @@ Build-Depends: cmake (>= 2.8.12~),
kf6-kxmlgui-dev,
libx11-dev,
pkg-kde-tools-neon
-Standards-Version: 3.9.8
+Standards-Version: 4.6.2
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: kpim6-kontactinterface
+Architecture: any
+X-Neon-MergedPackage: true
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Description: Kontact interface library
+ This library provides the glue necessary for application "Parts" to be
+ embedded as a Kontact component (or plugin).
+
Package: kpim6-kontactinterface-dev
Section: libdevel
Architecture: any
+X-Neon-MergedPackage: true
Depends: kf6-kparts-dev,
kf6-kio-dev,
kpim6-kontactinterface (= ${binary:Version}),
@@ -34,29 +44,59 @@ Description: Kontact interface library - development files
.
This package contains the development files.
-Package: kpim6-kontactinterface
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends},
- ${shlibs:Depends}
-Description: Kontact interface library
- This library provides the glue necessary for application "Parts" to be
- embedded as a Kontact component (or plugin).
+Package: libkpim6kontactinterface6
+Architecture: all
+Depends: kpim6-kontactinterface, ${misc:Depends}
+Replaces: libkf6kontactinterface6, libkf5kontactinterface5
+Description: Dummy transitional
+ Transitional dummy package.
-Package: libkf6kontactinterface-dev
+Package: libkpim6kontactinterface-data
Architecture: all
-Depends: kpim6-kontactinterface-dev
+Depends: kpim6-kontactinterface, ${misc:Depends}
+Replaces: libkf6kontactinterface-data, libkf5kontactinterface-data
Description: Dummy transitional
Transitional dummy package.
-Package: libkf6kontactinterface-data
+Package: libkpim6kontactinterface-dev
Architecture: all
-Depends: kpim6-kontactinterface
+Depends: kpim6-kontactinterface-dev, ${misc:Depends}
+Replaces: libkf6kontactinterface-dev, libkf5kontactinterface-dev
Description: Dummy transitional
Transitional dummy package.
Package: libkf6kontactinterface6
Architecture: all
-Depends: kpim6-kontactinterface
+Depends: libkpim6kontactinterface6, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6kontactinterface-data
+Architecture: all
+Depends: libkpim6kontactinterface-data, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6kontactinterface-dev
+Architecture: all
+Depends: libkpim6kontactinterface-dev, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5kontactinterface5
+Architecture: all
+Depends: libkpim6kontactinterface6, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5kontactinterface-data
+Architecture: all
+Depends: libkpim6kontactinterface-data, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5kontactinterface-dev
+Architecture: all
+Depends: libkpim6kontactinterface-dev, ${misc:Depends}
Description: Dummy transitional
Transitional dummy package.
diff --git a/debian/kpim6-kontactinterface-dev.acc.in b/debian/kpim6-kontactinterface-dev.acc.in
deleted file mode 100644
index 55d8dae..0000000
--- a/debian/kpim6-kontactinterface-dev.acc.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
- 15.07.90
-</version>
-
-<headers>
- /usr/include/Kpim6/KontactInterface/
- /usr/include/Kpim6/kontactinterface_version.h
-</headers>
-
-<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/Kpim6KontactInterface.so
-</libs>
-
-<gcc_options>
- -fPIC
- -std=c++11
-</gcc_options>
-
-</descriptor>
diff --git a/debian/kpim6-kontactinterface.lintian-overrides b/debian/kpim6-kontactinterface.lintian-overrides
index 6d0c517..aaf8226 100644
--- a/debian/kpim6-kontactinterface.lintian-overrides
+++ b/debian/kpim6-kontactinterface.lintian-overrides
@@ -1 +1 @@
-libkf5kontactinterface5: package-name-doesnt-match-sonames libKPim5KontactInterface5
+kpim6-kontactinterface: package-name-doesnt-match-sonames libKPim6KontactInterface6
\ No newline at end of file
diff --git a/debian/kpim6-kontactinterface.maintscript b/debian/kpim6-kontactinterface.maintscript
deleted file mode 100644
index 2c1cf96..0000000
--- a/debian/kpim6-kontactinterface.maintscript
+++ /dev/null
@@ -1,2 +0,0 @@
-rm_conffile /etc/xdg/kontactinterface.categories
-rm_conffile /etc/xdg/kontactinterface.renamecategories
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644
index eb9b550..0000000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kontactinterface source: syntax-error-in-debian-tests-control
diff --git a/debian/tests/acc b/debian/tests/acc
deleted file mode 100755
index 28b8d41..0000000
--- a/debian/tests/acc
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-for in_file in debian/*.acc.in; do
- out_file=${in_file%.in}
- sed 's/@@DEB_HOST_MULTIARCH@@/'"${DEB_HOST_MULTIARCH}"'/' \
- "${in_file}" > "${out_file}"
-done
-
-DH_VERBOSE=1
-
-dh_acc
-ret=$?
-if [ 0 -ne $ret ]; then
- cp -r logs "${ADT_ARTIFACTS}"/acc.logs
-fi
-exit $ret
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
deleted file mode 100755
index be87224..0000000
--- a/debian/tests/testsuite
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-dbus-launch --exit-with-session dh_auto_test
More information about the Neon-commits
mailing list