[SCM] kaddressbook packaging branch, master, updated. debian/16.04.3-1-78-gfe089ae
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Sep 2 16:35:13 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kaddressbook.git;a=commitdiff;h=85ee4bf
The following commit has been merged in the master branch:
commit 85ee4bf8eefd9a6531c509460124909d3791b65a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Fri Aug 25 17:22:07 2017 +0200
Editorial changes... Drop some of the things inherited from kdepim
---
debian/control | 143 ++++++++--------------------------------
debian/rules | 18 -----
debian/source/lintian-overrides | 1 -
debian/tests/control | 2 +-
debian/tests/testsuite | 2 +-
debian/tests/testsuite.xsession | 4 +-
6 files changed, 31 insertions(+), 139 deletions(-)
diff --git a/debian/control b/debian/control
index 1d826fb..ad4dc87 100644
--- a/debian/control
+++ b/debian/control
@@ -8,122 +8,29 @@ 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),
- extra-cmake-modules (>= 5.23.0~),
- kdoctools-dev (>= 5.23.0~),
- kio-dev (>= 5.23.0~),
- kross-dev (>= 5.23.0~),
- libassuan-dev,
- libboost-dev (>= 1.40.0-2),
- libboost-graph-dev (>= 1.40.0-2),
- libgpgme11-dev,
- libgrantlee5-dev (>= 5.1~),
- libpgmepp-dev | libqgpgme7-dev,
- libkf5akonadi-dev (>= 4:15.12~),
- libkf5akonadicalendar-dev (>= 15.12~),
- libkf5akonadicontact-dev (>= 4:15.12~),
- libkf5akonadimime-dev (>= 4:15.12~),
- libkf5akonadinotes-dev (>= 4:15.12~),
- libkf5akonadisearch-dev (>= 15.12~),
- libkf5akonadiserver-dev (>= 15.12~),
- libkf5alarmcalendar-dev (>= 15.12~),
- libkf5archive-dev (>= 5.23.0~),
- libkf5auth-dev (>= 5.23.0~),
- libkf5blog-dev (>= 15.12~),
- libkf5bookmarks-dev (>= 5.23.0~),
- libkf5calendarcore-dev (>= 4:15.12~),
- libkf5calendarsupport-dev (>= 5.3.0~),
- libkf5calendarutils-dev (>= 15.12~),
- libkf5codecs-dev (>= 5.23.0~),
- libkf5completion-dev (>= 5.23.0~),
- libkf5config-dev (>= 5.23.0~),
- libkf5configwidgets-dev (>= 5.23.0~),
- libkf5contacts-dev (>= 15.12~),
- libkf5coreaddons-dev (>= 5.23.0~),
- libkf5crash-dev (>= 5.23.0~),
- libkf5dbusaddons-dev (>= 5.23.0~),
- libkf5dnssd-dev (>= 5.23.0~),
- libkf5doctools-dev (>= 5.23.0~),
- libkf5eventviews-dev (>= 5.3.0~),
- libkf5followupreminder-dev (>= 5.3.0~),
- libkf5gapi-dev (>= 5.3.0~),
- libkf5globalaccel-dev (>= 5.23.0~),
- libkf5gpgmepp-dev (>= 15.12~),
- libkf5grantleetheme-dev (>= 5.3.0~),
- libkf5guiaddons-dev (>= 5.23.0~),
- libkf5contacteditor-dev (>= 17.04.0~),
- libkf5gravatar-dev (>= 5.2.0~),
- libkf5holidays-dev (>= 15.12~),
- libkf5i18n-dev (>= 5.23.0~),
- libkf5iconthemes-dev (>= 5.23.0~),
- libkf5identitymanagement-dev (>= 15.12~),
- libkf5imap-dev (>= 15.12~),
- libkf5incidenceeditor-dev (>= 5.3.0~),
- libkf5itemmodels-dev (>= 5.23.0~),
- libkf5itemviews-dev (>= 5.23.0~),
- libkf5jobwidgets-dev (>= 5.23.0~),
- libkf5kaddressbookgrantlee-dev (>= 5.3.0~),
- libkf5kcmutils-dev (>= 5.23.0~),
- libkf5kdelibs4support-dev (>= 5.23.0~),
- libkf5kdepimdbusinterfaces-dev (>= 5.3.0~),
- libkf5kaddressbookimportexport-dev (>= 5.2.0~),
- libkf5khtml-dev (>= 5.16.0~),
- libkf5kontactinterface-dev (>= 15.12~),
- libkf5ksieve-dev (>= 5.3.0~),
- libkf5ldap-dev (>= 15.12~),
- libkf5libkdepim-dev (>= 5.3.0~),
- libkf5libkleo-dev (>= 5.3.0~),
- libkf5mailcommon-dev (>= 4:16.04.2~),
- libkf5mailimporter-dev (>= 5.3.0~),
- libkf5mailtransport-dev (>= 15.12~),
- libkf5mbox-dev (>= 15.12~),
- libkf5messagecomposer-dev (>= 5.3.0~),
- libkf5messagecore-dev (>= 5.3.0~),
- libkf5messagelist-dev (>= 5.3.0~),
- libkf5messageviewer-dev (>= 5.3.0~),
- libkf5mime-dev (>= 15.12~),
- libkf5newstuff-dev (>= 5.23.0~),
- libkf5notifications-dev (>= 5.23.0~),
- libkf5notifyconfig-dev (>= 5.23.0~),
- libkf5parts-dev (>= 5.23.0~),
- libkf5pimcommon-dev (>= 5.3.0~),
- libkf5pimtextedit-dev (>= 15.12~),
- libkf5sendlater-dev (>= 5.3.0~),
- libkf5service-dev (>= 5.23.0~),
- libkf5sonnet-dev (>= 5.23.0~),
- libkf5mimetreeparser-dev,
- libkf5prison-dev,
- libkf5syndication-dev (>= 15.12~),
- libkf5templateparser-dev (>= 4:5.3.0~),
- libkf5texteditor-dev (>= 5.23.0~),
- libkf5textwidgets-dev (>= 5.23.0~),
- libkf5tnef-dev (>= 15.12~),
- libkf5wallet-dev (>= 5.23.0~),
- libkf5webkit-dev (>= 5.19.0~),
- libkf5widgetsaddons-dev (>= 5.23.0~),
- libkf5windowsystem-dev (>= 5.23.0~),
- libkf5xmlgui-dev (>= 5.23.0~),
- libkf5xmlrpcclient-dev (>= 5.3.0~),
- libkf5webengineviewer-dev,
- libkpimgapi-dev (>= 5.1~),
- libphonon4qt5-dev,
- libphonon4qt5experimental-dev,
- libqt5opengl5-dev (>= 5.5.0~),
- libqt5webchannel5-dev | libqt5webchannel-dev,
- libqt5webkit5-dev (>= 5.5.0~),
- libqt5x11extras5-dev (>= 5.4.0~),
- libx11-dev,
+ extra-cmake-modules (>= 5.35.0~),
+ libgpgmepp-dev (>= 1.8.0~),
+ libkf5akonadi-dev (>= 4:5.6.0~),
+ libkf5akonadisearch-dev (>= 4:5.6.0~),
+ libkf5crash-dev (>= 5.35.0~),
+ libkf5dbusaddons-dev (>= 5.35.0~),
+ libkf5doctools-dev (>= 5.35.0~),
+ libkf5grantleetheme-dev (>= 5.6.0~),
+ libkf5kaddressbookgrantlee-dev (>= 4:5.6.0~),
+ libkf5kaddressbookimportexport-dev (>= 4:5.6.0~),
+ libkf5kcmutils-dev (>= 5.35.0~),
+ libkf5kdepimdbusinterfaces-dev (>= 4:5.6.0~),
+ libkf5kontactinterface-dev (>= 5.6.0~),
+ libkf5libkdepim-dev (>= 4:5.6.0~),
+ libkf5libkleo-dev (>= 4:5.6.0~),
+ libkf5pimcommon-dev (>= 4:5.6.0~),
+ libkf5pimtextedit-dev (>= 5.6.0~),
pkg-config,
pkg-kde-tools (>= 0.12),
- qtbase5-dev (>= 5.6.0~),
- qtdeclarative5-dev (>= 5.4.0~),
- qttools5-dev (>= 5.6.0~),
- qtwebengine5-dev | libqt5webengine5-dev,
- shared-mime-info,
- xsltproc,
- zlib1g-dev
+ qtbase5-dev (>= 5.7.0~),
Standards-Version: 3.9.8
Homepage: http://pim.kde.org/
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kaddressbook.git
@@ -132,12 +39,18 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kaddressbook.git
Package: kaddressbook
Section: utils
Architecture: any
-Breaks: kontact (<< 4:16.11), ${kde-l10n:all}
-Replaces: kontact (<< 4:16.11), ${kde-l10n:all}
+Breaks: kde-l10n-ast (<< 4:17.03.90-0~),
+ kde-l10n-eo (<< 4:17.03.90-0~),
+ kontact (<< 4:16.11),
+ ${kde-l10n:all},
+Replaces: kde-l10n-ast (<< 4:17.03.90-0~),
+ kde-l10n-eo (<< 4:17.03.90-0~),
+ kontact (<< 4:16.11),
+ ${kde-l10n:all},
Depends: libkf5akonadisearch-bin,
libkf5akonadisearch-plugins,
${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
Description: address book and contact data manager
KAddressBook enables you to manage your contacts efficiently and comfortably.
It can load and save your contacts to many different locations, including
diff --git a/debian/rules b/debian/rules
index 731f16a..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='kaddressbook-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 63306bc..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kaddressbook 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
--
kaddressbook packaging
More information about the pkg-kde-commits
mailing list