[neon/kde/kdepim-addons/Neon/unstable] debian: clean, new deps, docs, unity build
Carlos De Maine
null at kde.org
Mon Oct 30 04:08:46 GMT 2023
Git commit ae64c6fec1aedec35ac8fe6a30070ba00694fc5a by Carlos De Maine.
Committed on 30/10/2023 at 05:08.
Pushed by carlosdem into branch 'Neon/unstable'.
clean, new deps, docs, unity build
M +5 -1 debian/control
M +5 -0 debian/rules
D +0 -18 debian/tests/acc
D +0 -18 debian/tests/control
D +0 -5 debian/tests/testsuite
D +0 -17 debian/tests/testsuite.xsession
https://invent.kde.org/neon/kde/kdepim-addons/-/commit/ae64c6fec1aedec35ac8fe6a30070ba00694fc5a
diff --git a/debian/control b/debian/control
index bfeb5fd..487c6e6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,11 @@ 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,
+ cargo,
+ corrosion,
debhelper-compat (= 13),
+ discount,
+ doxygen,
kaddressbook,
kf6-extra-cmake-modules,
kf6-kconfig-dev,
@@ -18,7 +22,6 @@ Build-Depends: cmake,
kpim6-akonadi-dev,
kpim6-akonadi-notes-dev,
kpim6-calendarsupport-dev,
- libkf6contacteditor-dev,
kpim6-eventviews-dev,
kpim6-grantleetheme-dev,
kpim6-libgravatar-dev,
@@ -48,6 +51,7 @@ Build-Depends: cmake,
qt6-base-dev,
qt6-webchannel-dev,
qt6-webengine-dev,
+ rustc,
Standards-Version: 4.6.2
Homepage: https://pim.kde.org/
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kdepim-addons.git
diff --git a/debian/rules b/debian/rules
index 3d69b0d..141287f 100644
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,8 @@
%:
dh $@ --with kf6 --buildsystem kf6
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ -DCOMPILE_WITH_UNITY_CMAKE_SUPPORT=ON \
+ -DBUILD_QCH=ON
\ No newline at end of file
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 3180a79..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,18 +0,0 @@
-Tests: testsuite
-Depends: akonadi-backend-sqlite,
- akonadi-server,
- build-essential,
- dbus-x11,
- kded5,
- kinit,
- libgl1-mesa-dri,
- libkf5akonadi-dev-bin,
- libkf5akonadisearch-bin,
- openbox,
- oxygen5-icon-theme,
- plasma-workspace,
- xauth,
- xvfb,
- @,
- @builddeps@
-Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
deleted file mode 100755
index 60e6d06..0000000
--- a/debian/tests/testsuite
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-export HOME=$(mktemp -d)
-trap "rm -rf ${HOME}" EXIT
-xvfb-run -a --server-args="-screen 0 1024x768x24" \
- dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
deleted file mode 100755
index 14856a3..0000000
--- a/debian/tests/testsuite.xsession
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-export LANG=C.UTF-8
-export LC_ALL=C.UTF-8
-export XDG_CACHE_HOME="$HOME"
-export XDG_DATA_HOME="${HOME}/.qttest/share"
-export XDG_RUNTIME_DIR="${HOME}/runtime"
-mkdir -p ${XDG_DATA_HOME} || true
-mkdir -p ${XDG_RUNTIME_DIR} || true
-export XDG_DATA_DIRS="$XDG_DATA_HOME:${HOME}/.local/share:/usr/share"
-openbox & WMPID=$!
-kdeinit5
-cleanup () {
- kdeinit5_shutdown
- if [ -n "$WMPID" ]; then kill "$WMPID"; fi
-}
-trap cleanup EXIT
-dh_auto_test
More information about the Neon-commits
mailing list