[SCM] kdeplasma-addons packaging branch, master, updated. 65ae058b45bc4e38fc64489a97fd599663d2f5db
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Mar 26 12:42:18 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kdeplasma-addons.git;a=commitdiff;h=918f113
The following commit has been merged in the master branch:
commit 918f113cdfeb69ffb3885802128f44db3c986cd2
Merge: 6d52ae6714a545f62920fd83ce0eada568dd163b 90a2e9a57dee48b3f871f32063d4b9884e2df745
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Mar 25 10:40:38 2015 +0100
Merge commit '90a2e9a57dee48b3f871f32063d4b9884e2df745'
Conflicts:
debian/control
debian/changelog | 18 ++++++++++++++++++
debian/control | 15 ++++++++++++++-
debian/plasma-dataengines-addons.lintian-overrides | 2 +-
debian/plasma-widget-kimpanel.install | 1 +
debian/plasma-widgets-addons.install | 9 ++++++++-
5 files changed, 42 insertions(+), 3 deletions(-)
diff --cc debian/changelog
index 0a9ef9d,ae61287..44d6ab0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,21 +1,40 @@@
+kdeplasma-addons (4:5.2.2-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.2.1).
+ * New upstream release (5.2.2).
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 25 Mar 2015 09:58:23 +0100
+
+ kdeplasma-addons (4:5.2.2-0ubuntu2) vivid; urgency=medium
+
+ * Fix .install files
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 25 Mar 2015 00:49:53 +0100
+
+ kdeplasma-addons (4:5.2.2-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Tue, 24 Mar 2015 07:13:42 -0700
+
+ kdeplasma-addons (4:5.2.1-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 23 Feb 2015 09:37:47 -0800
+
+kdeplasma-addons (4:5.2.0-1) experimental; urgency=medium
+
+ * Prepare initial Debian release.
+ * Add myself as Uploader.
+ * Update build dependencies to build against experimental and to
+ follow cmake.
+ * Update copyright information.
+ * Update install files.
+ * Update watch file.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 09 Feb 2015 13:48:48 +0100
+
kdeplasma-addons (4:5.2.0-0ubuntu1) vivid; urgency=medium
* Fix the -data depends to use source:Version rather than binary:
diff --cc debian/control
index 352d77b,c1a29f0..071f083
--- a/debian/control
+++ b/debian/control
@@@ -1,15 -1,14 +1,16 @@@
Source: kdeplasma-addons
-Section: utils
+Section: kde
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: cmake,
+Uploaders: Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake (>= 2.8.12),
debhelper (>= 9),
- extra-cmake-modules,
+ extra-cmake-modules (>= 1.0.0),
+ kinit-dev,
kio-dev (>= 5.2.0),
- kross-dev,
+ kross-dev (>= 5.2.0),
- libboost1.55-dev,
+ libboost-dev,
+ libgee-dev,
libglib2.0-dev,
libibus-1.0-dev,
libkf5config-dev (>= 5.2.0),
@@@ -50,7 -47,10 +52,9 @@@ Multi-Arch: foreig
Package: kwin-addons
Architecture: any
-Section: kde
Depends: kdeplasma-addons-data (= ${source:Version}),
+ kwin,
+ plasma-framework,
${misc:Depends},
${shlibs:Depends}
Breaks: kwin-data (<< 4:5.1.0.1+git20141031.1444)
@@@ -63,7 -63,9 +67,8 @@@ Description: additional desktop and win
Package: plasma-widgets-addons
Architecture: any
-Section: kde
Depends: kdeplasma-addons-data (= ${source:Version}),
+ kpackagetool5,
plasma-dataengines-addons (= ${binary:Version}),
qml-module-org-kde-kio,
${misc:Depends},
@@@ -89,7 -91,9 +94,8 @@@ Description: additional widgets for Pla
Package: plasma-dataengines-addons
Architecture: any
-Section: kde
Depends: kdeplasma-addons-data (= ${source:Version}),
+ kross,
${misc:Depends},
${shlibs:Depends}
Description: additional data engines for Plasma
@@@ -117,7 -122,9 +123,8 @@@ Description: additional runners for Pla
Package: plasma-wallpapers-addons
Architecture: any
-Section: kde
Depends: kdeplasma-addons-data (= ${source:Version}),
+ plasma-framework,
${misc:Depends},
${shlibs:Depends}
Description: additional wallpaper plugins for Plasma 5
@@@ -133,9 -140,16 +140,15 @@@
Package: plasma-widget-kimpanel
Architecture: any
-Section: kde
Depends: kdeplasma-addons-data (= ${source:Version}),
+ plasma-framework,
+ qml-module-org-kde-kquickcontrolsaddons,
+ qml-module-qtquick-layouts,
+ qml-module-qtquick2,
${misc:Depends},
${shlibs:Depends}
+ Breaks: plasma-widgets-addons (<< 4:5.2.1+git20150318.0041)
+ Replaces: plasma-widgets-addons (<< 4:5.2.1+git20150318.0041)
Description: KIMPanel widget for Plasma
This package provides the KDE Input Method Panel widget for Plasma 5.
.
--
kdeplasma-addons packaging
More information about the pkg-kde-commits
mailing list