[SCM] kdeclarative packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-11-g489d9f3
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Tue Jul 14 21:31:10 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdeclarative.git;a=commitdiff;h=489d9f3
The following commit has been merged in the kubuntu_wily_archive branch:
commit 489d9f3e5d130fc9912acb134a9749b1b5aad303
Author: Jonathan Riddell <jr at jriddell.org>
Date: Tue Jul 14 23:31:03 2015 +0200
Revert "new upstream release"
This reverts commit 15ef8dd7e42185fe09345946e8a63bfde01cd623.
---
debian/changelog | 6 +-----
debian/control | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a2e369e..4f34ed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,9 @@
kdeclarative (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
- [ Scarlett Clark ]
* New upstream release
* Fix merge, remove unused broken backport.
- [ Jonathan Riddell ]
- * new upstream release
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 14 Jul 2015 22:58:02 +0200
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 08:02:52 -0700
kdeclarative (5.11.0-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 7478289..2b97883 100644
--- a/debian/control
+++ b/debian/control
@@ -6,17 +6,17 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.12),
debhelper (>= 9),
extra-cmake-modules (>= 5.12.0~),
- kio-dev (>= 5.12.0),
+ kio-dev (>= 5.12.0~),
libepoxy-dev,
libkf5config-dev (>= 5.12.0),
- libkf5globalaccel-dev (>= 5.12.0),
- libkf5guiaddons-dev (>= 5.12.0),
- libkf5i18n-dev (>= 5.12.0),
- libkf5iconthemes-dev (>= 5.12.0),
- libkf5itemviews-dev (>= 5.12.0),
- libkf5package-dev (>= 5.12.0),
- libkf5widgetsaddons-dev (>= 5.12.0),
- libkf5windowsystem-dev (>= 5.12.0),
+ libkf5globalaccel-dev (>= 5.12.0~),
+ libkf5guiaddons-dev (>= 5.12.0~),
+ libkf5i18n-dev (>= 5.12.0~),
+ libkf5iconthemes-dev (>= 5.12.0~),
+ libkf5itemviews-dev (>= 5.12.0~),
+ libkf5package-dev (>= 5.12.0~),
+ libkf5widgetsaddons-dev (>= 5.12.0~),
+ libkf5windowsystem-dev (>= 5.12.0~),
pkg-config,
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev (>= 5.4),
@@ -37,9 +37,9 @@ Description: commandline tool for launching kpackage QML application
Package: libkf5declarative-dev
Section: libdevel
Architecture: any
-Depends: kio-dev (>= 5.12.0),
+Depends: kio-dev (>= 5.12.0~),
libkf5declarative5 (= ${binary:Version}),
- libkf5package-dev (>= 5.12.0),
+ libkf5package-dev (>= 5.12.0~),
libkf5quickaddons5 (= ${binary:Version}),
qtbase5-dev (>= 5.4),
qtdeclarative5-dev (>= 5.4),
--
kdeclarative packaging
More information about the pkg-kde-commits
mailing list