[SCM] akregator packaging branch, master, updated. debian/16.04.3-1-89-g7519c37
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Aug 25 06:18:54 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akregator.git;a=commitdiff;h=0f89a66
The following commit has been merged in the master branch:
commit 0f89a664cac791dd35eefe22a8edc164f2da488a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sun Aug 20 17:04:21 2017 +0200
Editorial changes... Drop some of the things inherited from kdepim
---
debian/control | 68 +----------------------------------------
debian/docs | 1 -
debian/rules | 19 ------------
debian/source/lintian-overrides | 1 -
debian/tests/control | 2 +-
debian/tests/testsuite | 2 +-
debian/tests/testsuite.xsession | 4 +--
7 files changed, 4 insertions(+), 93 deletions(-)
diff --git a/debian/control b/debian/control
index dc94f04..a3214d8 100644
--- a/debian/control
+++ b/debian/control
@@ -11,74 +11,9 @@ Uploaders: Sune Vuorela <sune at debian.org>,
Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.12~),
debhelper (>= 9),
- extra-cmake-modules (>= 5.19.0~),
- kross-dev (>= 5.19.0~),
- libassuan-dev,
- libgpgme-dev | libgpgme11-dev,
- libgrantlee5-dev (>= 5.0.0~),
- libkf5akonadi-dev (>= 4:15.12~),
- libkf5akonadimime-dev (>= 4:15.12~),
- libkf5akonadiserver-dev (>= 15.12~),
- libkf5archive-dev (>= 5.19.0~),
- libkf5auth-dev (>= 5.19.0~),
- libkf5codecs-dev (>= 5.19.0~),
- libkf5completion-dev (>= 5.16.0~),
- libkf5config-dev (>= 5.19.0~),
- libkf5contacteditor-dev (>= 17.04.0~),
- libkf5coreaddons-dev (>= 5.16.0~),
- libkf5crash-dev (>= 5.19.0~),
- libkf5dbusaddons-dev (>= 5.19.0~),
- libkf5dnssd-dev (>= 5.19.0~),
- libkf5doctools-dev,
- libkf5globalaccel-dev (>= 5.19.0~),
- libkf5grantleetheme-dev (>= 5.2.0~),
- libkf5i18n-dev (>= 5.16.0~),
- libkf5iconthemes-dev (>= 5.16.0~),
- libkf5itemviews-dev (>= 5.16.0~),
- libkf5kcmutils-dev (>= 5.19.0~),
- libkf5kdelibs4support-dev (>= 5.19.0~),
- libkf5khtml-dev (>= 5.16.0~),
- libkf5kontactinterface-dev (>= 15.12~),
- libkf5libkdepim-dev (>= 5.2.0~),
- libkf5libkleo-dev (>= 5.2.0~),
- libkf5messagecomposer-dev,
- libkf5messagecore-dev (>= 5.2.0~),
- libkf5messagelist-dev,
- libkf5messageviewer-dev (>= 5.2.0~),
- libkf5mimetreeparser-dev,
- libkf5newstuff-dev (>= 5.19.0~),
- libkf5notifyconfig-dev (>= 5.19.0~),
- libkf5pimcommon-dev (>= 5.2.0~),
- libkf5pimtextedit-dev (>= 15.12~),
- libkf5service-dev (>= 5.19.0~),
- libkf5sonnet-dev (>= 5.19.0~),
- libkf5syndication-dev (>= 15.12~),
- libkf5templateparser-dev,
- libkf5texteditor-dev (>= 5.19.0~),
- libkf5textwidgets-dev (>= 5.16.0~),
- libkf5wallet-dev (>= 5.19.0~),
- libkf5webengineviewer-dev,
- libkf5webkit-dev (>= 5.19.0~),
- libkf5widgetsaddons-dev (>= 5.16.0~),
- libkf5windowsystem-dev (>= 5.16.0~),
- libkf5xmlgui-dev (>= 5.16.0~),
- libkf5xmlrpcclient-dev (>= 5.2.0~),
- libphonon4qt5-dev,
- libphonon4qt5experimental-dev,
- libqt5opengl5-dev (>= 5.5.0~),
- libqt5webchannel5-dev,
- libqt5webkit5-dev (>= 5.5.0~),
- libqt5x11extras5-dev (>= 5.4.0~),
- libx11-dev,
pkg-config,
pkg-kde-tools (>= 0.12),
qtbase5-dev (>= 5.5.0~),
- qtdeclarative5-dev (>= 5.4.0~),
- qttools5-dev (>= 5.5.0~),
- qtwebengine5-dev,
- shared-mime-info,
- xsltproc,
- zlib1g-dev
Standards-Version: 3.9.8
Homepage: http://pim.kde.org/
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/akregator.git
@@ -87,7 +22,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kdepim.git
Package: akregator
Section: web
Architecture: any
-Depends: kinit, kio, libqt5webengine5, ${misc:Depends}, ${shlibs:Depends}
+Depends: kinit, kio, ${misc:Depends}, ${shlibs:Depends}
Breaks: kdepim-doc (<< 4:16.12.0), ${kde-l10n:all}
Replaces: kdepim-doc (<< 4:16.12.0), ${kde-l10n:all}
Homepage: http://akregator.kde.org/
@@ -98,4 +33,3 @@ Description: RSS/Atom feed aggregator
both easy to use and to be powerful enough to read hundreds of news sources
conveniently. It comes with Konqueror integration for adding news feeds and
with an internal browser for easy news reading.
- .
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 ce4c922..7ae56a5 100644
--- a/debian/rules
+++ b/debian/rules
@@ -2,31 +2,12 @@
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
:
-# Strict local dependencies (there are no external ones anyway)
-override_dh_makeshlibs:
- $(overridden_command) -V
-
override_dh_strip:
$(overridden_command) --dbgsym-migration='kdepim-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 248046b..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-akregator 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
--
akregator packaging
More information about the pkg-kde-commits
mailing list