[SCM] plasma-framework packaging branch, master, updated. 09a0c88c9807c2cdef287af8d0bc313d2cf86c9f
Maximiliano Curia
maxy at moszumanska.debian.org
Mon Mar 23 10:18:00 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=c3ffa1a
The following commit has been merged in the master branch:
commit c3ffa1ac5dad415c190940066f62daea3298d838
Merge: 157e0571a914daa4d15428fa76720708ad02ff35 9482c4d6870b0f3905aa5a0feac1856b289a28cd
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Fri Mar 6 10:24:05 2015 +0100
Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
Conflicts:
debian/control
debian/changelog | 6 ++++++
debian/control | 60 ++++++++++++++++++++++++++++----------------------------
2 files changed, 36 insertions(+), 30 deletions(-)
diff --cc debian/changelog
index 120703c,0282eb7..3745543
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,9 +1,29 @@@
+plasma-framework (5.7.0-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.7.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 24 Feb 2015 17:57:37 +0100
+
+ plasma-framework (5.7.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Harald Sitter <sitter at kde.org> Tue, 10 Feb 2015 16:19:10 +0100
+
+plasma-framework (5.6.0-1) experimental; urgency=medium
+
+ * Prepare initial Debian release.
+ * Update build dependencies to build against experimental and to
+ follow cmake.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Update copyright information.
+ * Update install files.
+ * Update watch file.
+ * Add basic autopkgtests support.
+ * Update symbols files.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 06 Feb 2015 12:43:28 +0100
+
plasma-framework (5.6.0-0ubuntu1) vivid; urgency=medium
* New upstream release
diff --cc debian/control
index 7c703a2,bc9774d..155d029
--- a/debian/control
+++ b/debian/control
@@@ -3,36 -3,49 +3,36 @@@ 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),
- kio-dev (>= 5.6.0),
- kross-dev (>= 5.6.0),
- libkf5activities-dev (>= 5.6.0),
- libkf5archive-dev (>= 5.6.0),
- libkf5codecs-dev (>= 5.6.0),
- libkf5config-dev (>= 5.6.0),
- libkf5configwidgets-dev (>= 5.6.0),
- libkf5coreaddons-dev (>= 5.6.0),
- libkf5dbusaddons-dev (>= 5.6.0),
- libkf5declarative-dev (>= 5.6.0),
- libkf5globalaccel-dev (>= 5.6.0),
- libkf5guiaddons-dev (>= 5.6.0),
- libkf5i18n-dev (>= 5.6.0),
- libkf5iconthemes-dev (>= 5.6.0),
- libkf5idletime-dev (>= 5.6.0),
- libkf5itemmodels-dev (>= 5.6.0),
- libkf5notifications-dev (>= 5.6.0),
- libkf5package-dev (>= 5.6.0),
- libkf5parts-dev (>= 5.6.0),
- libkf5service-dev (>= 5.6.0),
- libkf5solid-dev (>= 5.6.0),
- libkf5su-dev (>= 5.6.0),
- libkf5threadweaver-dev (>= 5.6.0),
- libkf5widgetsaddons-dev (>= 5.6.0),
- libkf5windowsystem-dev (>= 5.6.0),
- libkf5xmlgui-dev (>= 5.6.0),
+ extra-cmake-modules (>= 1.7.0),
+ kdoctools-dev (>= 5.7.0),
+ kio-dev (>= 5.7.0),
+ kross-dev (>= 5.7.0),
+ libkf5activities-dev (>= 5.7.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),
+ libkf5declarative-dev (>= 5.7.0),
- libkf5dnssd-dev (>= 5.7.0),
+ libkf5globalaccel-dev (>= 5.7.0),
+ libkf5guiaddons-dev (>= 5.7.0),
+ libkf5i18n-dev (>= 5.7.0),
+ libkf5iconthemes-dev (>= 5.7.0),
+ libkf5idletime-dev (>= 5.7.0),
+ libkf5itemmodels-dev (>= 5.7.0),
- libkf5itemviews-dev (>= 5.7.0),
- libkf5jobwidgets-dev (>= 5.7.0),
- libkf5kjs-dev (>= 5.7.0),
+ libkf5notifications-dev (>= 5.7.0),
+ libkf5package-dev (>= 5.7.0),
+ libkf5parts-dev (>= 5.7.0),
+ libkf5service-dev (>= 5.7.0),
+ libkf5solid-dev (>= 5.7.0),
- libkf5sonnet-dev (>= 5.7.0),
- libkf5texteditor-dev (>= 5.7.0),
- libkf5textwidgets-dev (>= 5.7.0),
++ libkf5su-dev (>= 5.7.0),
+ libkf5threadweaver-dev (>= 5.7.0),
- libkf5unitconversion-dev (>= 5.7.0),
- libkf5wallet-dev (>= 5.7.0),
+ libkf5widgetsaddons-dev (>= 5.7.0),
+ libkf5windowsystem-dev (>= 5.7.0),
+ libkf5xmlgui-dev (>= 5.7.0),
libqt5svg5-dev,
libqt5x11extras5-dev,
libsm-dev,
@@@ -56,10 -68,10 +56,10 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
Package: plasma-framework-dev
Architecture: any
Section: libdevel
- Depends: libkf5package-dev (>= 5.6.0),
-Depends: libkf5package-dev,
++Depends: libkf5package-dev (>= 5.7.0),
libkf5plasma5 (= ${binary:Version}),
libkf5plasmaquick5 (= ${binary:Version}),
- libkf5service-dev (>= 5.6.0),
- libkf5service-dev,
++ libkf5service-dev (>= 5.7.0),
${misc:Depends}
Description: development files for plasma-framework
Plasma library and runtime components based upon KF5 and Qt 5.
--
plasma-framework packaging
More information about the pkg-kde-commits
mailing list