[SCM] kalarm packaging branch, master, updated. debian/16.04.3-1-76-gdcc0653
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Sep 2 16:36:14 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kalarm.git;a=commitdiff;h=ba1ff50
The following commit has been merged in the master branch:
commit ba1ff507eb2ff5f747e420e37997dd664eaaf642
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Fri Aug 25 18:33:34 2017 +0200
Editorial changes... Drop some of the things inherited from kdepim
---
debian/control | 10 +++++++---
debian/docs | 1 -
debian/rules | 18 ------------------
debian/source/lintian-overrides | 1 -
debian/tests/control | 2 +-
debian/tests/testsuite | 2 +-
debian/tests/testsuite.xsession | 4 +---
7 files changed, 10 insertions(+), 28 deletions(-)
diff --git a/debian/control b/debian/control
index 84f4f3f..50cda06 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Sune Vuorela <sune at debian.org>,
Michael Meskes <meskes at debian.org>,
George Kiagiadakis <kiagiadakis.george at gmail.com>,
Eshat Cakar <info at eshat.de>,
- Maximiliano Curia <maxy at debian.org>
+ Maximiliano Curia <maxy at debian.org>,
Build-Depends: cmake (>= 3.1~),
debhelper (>= 9),
pkg-config,
@@ -23,8 +23,12 @@ Package: kalarm
Architecture: any
Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
Suggests: jovie
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
+Breaks: kde-l10n-ast (<< 4:17.03.90-0~),
+ kde-l10n-eo (<< 4:17.03.90-0~),
+ ${kde-l10n:all},
+Replaces: kde-l10n-ast (<< 4:17.03.90-0~),
+ kde-l10n-eo (<< 4:17.03.90-0~),
+ ${kde-l10n:all},
Homepage: http://www.astrojar.org.uk/kalarm/
Description: alarm message, command and email scheduler
KAlarm provides a graphical interface to schedule personal timed events -
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 8b13789..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/rules b/debian/rules
index 7795421..ad067f5 100644
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,8 @@
l10npkgs_firstversion_ok := 4:17.03.90-0~
-KDEPIM_RUNTIME_VERSION = 4:15.07.90
-
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
-libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
-include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
override_dh_auto_test:
# Disable dh_auto_test at build time
@@ -16,17 +12,3 @@ override_dh_auto_test:
# Strict local dependencies (there are no external ones anyway)
override_dh_makeshlibs:
$(overridden_command) -V
-
-override_dh_strip:
- $(overridden_command) --dbgsym-migration='kalarm-dbg (<= 4:15.12.1-1~~)'
-
-override_dh_shlibdeps:
- $(overridden_command)
- set -e; \
- if [ -n "`ls debian/*.substvars 2>/dev/null`" ]; then \
- echo "Tightening dependency on kdepim-runtime to (>= $(KDEPIM_RUNTIME_VERSION)"; \
- sed -i '/^shlibs:[^=]\+=/{ s/\(^shlibs:[^=]\+=[[:space:]]*\|,[[:space:]]*\)\(kdepim-runtime\)\([[:space:]]*([[:space:]]*[><=]\+[^)]\+)\)\?/ (>= $(KDEPIM_RUNTIME_VERSION))/g }' debian/*.substvars; \
- fi
-
-debian/PIM.png: debian/PIM.dot
- dot -Tpng debian/PIM.dot > debian/PIM.png
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index bbe930f..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kalarm source: intra-source-package-circular-dependency libcalendarsupport5 libeventviews5 libincidenceeditorsng5 libkdepim5 libkleo5 libmailcommon5 libmailimporter5 libmessagecomposer5 libmessageviewer5 libpimcommon5 libtemplateparser5
diff --git a/debian/tests/control b/debian/tests/control
index 9c85191..6c72fa0 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
Tests: testsuite
Depends: @, @builddeps@, build-essential,
- xvfb, xauth, dbus-x11,
+ xvfb, xauth, dbus,
akonadi-backend-sqlite, kinit, libkf5akonadi-dev-bin, libgl1-mesa-dri
Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 60d997a..a599827 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +1,3 @@
#!/bin/sh
xvfb-run -a --server-args="-screen 0 1024x768x24" \
- dbus-launch --exit-with-session debian/tests/testsuite.xsession
+ dbus-run-session -- debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 5216db9..98ca5e6 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -2,7 +2,5 @@
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
kdeinit5
+trap kdeinit5_shutdown EXIT
dh_auto_test
-ret=$?
-kdeinit5_shutdown
-exit $ret
--
kalarm packaging
More information about the pkg-kde-commits
mailing list