[SCM] kio packaging branch, master, updated. 552adf213029efd058f860cd200b3194cfd59258
Maximiliano Curia
maxy at moszumanska.debian.org
Mon Mar 23 09:19:55 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=28e174a
The following commit has been merged in the master branch:
commit 28e174af804b08fe648e82f7e97e50a7607da936
Merge: 17a04a2aad26a68df70fa84e06d600825914ee87 3ad8c8dabd2ec2230e6be321e089a72ad15c3fb7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Fri Mar 6 10:06:51 2015 +0100
Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
Conflicts:
debian/control
debian/tests/control
debian/changelog | 14 +++++++++++
debian/control | 56 +++++++++++++++++++++----------------------
debian/libkf5kiocore5.symbols | 2 +-
debian/tests/control | 8 +++----
4 files changed, 47 insertions(+), 33 deletions(-)
diff --cc debian/changelog
index 09a80e1,8c12b8e..397ff10
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,17 +1,36 @@@
+kio (5.7.0-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.7.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 24 Feb 2015 17:39:10 +0100
+
+ kio (5.7.0-0ubuntu2) vivid; urgency=medium
+
+ * Make sure autopkgtest pulls in own binary packages as Depends
+ such that data asset lookup (e.g. protocol configs) can be
+ found more reliably
+
+ -- Harald Sitter <sitter at kde.org> Fri, 13 Feb 2015 14:51:00 +0100
+
+ kio (5.7.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Harald Sitter <sitter at kde.org> Tue, 10 Feb 2015 16:52:44 +0100
+
+kio (5.6.0-1) experimental; urgency=medium
+
+ * Prepare initial Debian release.
+ * Add acc autopkgtests.
+ * Update build dependencies to build against experimental and to
+ follow cmake.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Update install files.
+ * Update watch file.
+ * Update symbols files.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 29 Jan 2015 15:12:37 +0100
+
kio (5.6.0-0ubuntu1) vivid; urgency=medium
* New upstream release
diff --cc debian/control
index 24e1e61,1ebb52a..2003469
--- a/debian/control
+++ b/debian/control
@@@ -3,30 -3,38 +3,30 @@@ Section: lib
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,
- debhelper (>= 9.0.0),
+Build-Depends: cmake (>= 2.8.12),
+ debhelper (>= 9),
- extra-cmake-modules (>= 1.6.0),
- kdoctools-dev (>= 5.6.0),
+ extra-cmake-modules (>= 1.7.0),
+ kdoctools-dev (>= 5.7.0),
libacl1-dev,
- libkf5archive-dev (>= 5.6.0),
- libkf5bookmarks-dev (>= 5.6.0),
- libkf5codecs-dev (>= 5.6.0),
- libkf5completion-dev (>= 5.6.0),
- libkf5config-dev (>= 5.6.0),
- libkf5configwidgets-dev (>= 5.6.0),
- libkf5coreaddons-dev (>= 5.6.0),
- libkf5dbusaddons-dev (>= 5.6.0),
- libkf5i18n-dev (>= 5.6.0),
- libkf5iconthemes-dev (>= 5.6.0),
- libkf5itemviews-dev (>= 5.6.0),
- libkf5jobwidgets-dev (>= 5.6.0),
- libkf5notifications-dev (>= 5.6.0),
- libkf5service-dev (>= 5.6.0),
- libkf5solid-dev (>= 5.6.0),
- libkf5wallet-dev (>= 5.6.0),
- libkf5widgetsaddons-dev (>= 5.6.0),
- libkf5windowsystem-dev (>= 5.6.0),
- libkf5xmlgui-dev (>= 5.6.0),
+ libkf5archive-dev (>= 5.7.0),
- libkf5attica-dev (>= 5.7.0),
- libkf5auth-dev (>= 5.7.0),
+ libkf5bookmarks-dev (>= 5.7.0),
+ libkf5codecs-dev (>= 5.7.0),
+ libkf5completion-dev (>= 5.7.0),
+ libkf5config-dev (>= 5.7.0),
+ libkf5configwidgets-dev (>= 5.7.0),
+ libkf5coreaddons-dev (>= 5.7.0),
- libkf5crash-dev (>= 5.7.0),
+ libkf5dbusaddons-dev (>= 5.7.0),
- libkf5globalaccel-dev (>= 5.7.0),
- libkf5guiaddons-dev (>= 5.7.0),
+ libkf5i18n-dev (>= 5.7.0),
+ libkf5iconthemes-dev (>= 5.7.0),
+ libkf5itemviews-dev (>= 5.7.0),
+ libkf5jobwidgets-dev (>= 5.7.0),
- libkf5kjs-dev (>= 5.7.0),
+ libkf5notifications-dev (>= 5.7.0),
+ libkf5service-dev (>= 5.7.0),
+ libkf5solid-dev (>= 5.7.0),
- libkf5sonnet-dev (>= 5.7.0),
- libkf5textwidgets-dev (>= 5.7.0),
+ libkf5wallet-dev (>= 5.7.0),
+ libkf5widgetsaddons-dev (>= 5.7.0),
+ libkf5windowsystem-dev (>= 5.7.0),
+ libkf5xmlgui-dev (>= 5.7.0),
libkrb5-dev,
libqt5x11extras5-dev,
libxml2-dev,
@@@ -45,18 -53,18 +45,18 @@@ Package: kio-de
Section: libdevel
Architecture: any
Depends: kio (= ${binary:Version}),
- libkf5bookmarks-dev (>= 5.6.0),
- libkf5completion-dev (>= 5.6.0),
- libkf5itemviews-dev (>= 5.6.0),
- libkf5jobwidgets-dev (>= 5.6.0),
- libkf5bookmarks-dev,
- libkf5completion-dev,
- libkf5itemviews-dev,
- libkf5jobwidgets-dev,
++ libkf5bookmarks-dev (>= 5.7.0),
++ libkf5completion-dev (>= 5.7.0),
++ libkf5itemviews-dev (>= 5.7.0),
++ libkf5jobwidgets-dev (>= 5.7.0),
libkf5kiocore5 (= ${binary:Version}),
libkf5kiofilewidgets5 (= ${binary:Version}),
libkf5kiontlm5 (= ${binary:Version}),
libkf5kiowidgets5 (= ${binary:Version}),
- libkf5service-dev (>= 5.6.0),
- libkf5solid-dev (>= 5.6.0),
- libkf5xmlgui-dev (>= 5.6.0),
- libkf5service-dev,
- libkf5solid-dev,
- libkf5xmlgui-dev,
- qtbase5-dev,
++ libkf5service-dev (>= 5.7.0),
++ libkf5solid-dev (>= 5.7.0),
++ libkf5xmlgui-dev (>= 5.7.0),
+ qtbase5-dev (>= 5.2.0),
${misc:Depends}
Description: Resource and network access abstraction.
KDE Input/Output framework provides a single API for
diff --cc debian/tests/control
index 0800df9,53e743e..744fce7
--- a/debian/tests/control
+++ b/debian/tests/control
@@@ -1,7 -1,4 +1,7 @@@
- # Tests: testsuite
- # Depends: @builddeps@, build-essential,
- # xvfb, xauth, dbus-x11, openbox
- # Restrictions: rw-build-tree
+ Tests: testsuite
+ Depends: @, @builddeps@, build-essential,
+ xvfb, xauth, dbus-x11, openbox
+ Restrictions: rw-build-tree
+
+Tests: acc
+Depends: @, dh-acc, exuberant-ctags
--
kio packaging
More information about the pkg-kde-commits
mailing list