[SCM] kcoreaddons packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-4-g5aec0eb
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Wed Jul 8 16:46:07 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcoreaddons.git;a=commitdiff;h=5aec0eb
The following commit has been merged in the kubuntu_unstable branch:
commit 5aec0ebb478ab8ba82123c7894c71b50e5524450
Merge: a8aec2b34a249d370f671d44b974d4a9eba1f6b7 cbe819ef33f228d48478cdcb4e4604fbcf59f939
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Wed Jul 8 09:45:57 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable
Conflicts:
debian/changelog
debian/control
debian/changelog | 6 ++++++
debian/control | 7 +++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --cc debian/changelog
index 9c2bc29,c1a369f..caf1afc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,9 +1,26 @@@
+ kcoreaddons (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+
+ * Vivid backport
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Wed, 08 Jul 2015 08:09:53 -0700
+
+kcoreaddons (5.11.0-2~) UNRELEASED; urgency=medium
+
+ * Update copyright information.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 26 Jun 2015 21:51:05 +0200
+
+kcoreaddons (5.11.0-1) unstable; urgency=medium
+
+ * New upstream release (5.10.0).
+ * Remove upstream applied patch: colliding_webp_mime_info
+ * New upstream release (5.11.0).
+ * Revert the -dev package to MA same.
+ * Update symbols files.
+ * Update copyright information.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 26 Jun 2015 13:14:02 +0200
+
kcoreaddons (5.10.0-0ubuntu1) wily; urgency=medium
[ Maximiliano Curia ]
diff --cc debian/control
index c524528,4e8c763..8a07f62
--- a/debian/control
+++ b/debian/control
@@@ -21,9 -21,7 +21,9 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
Package: libkf5coreaddons-dev
Section: libdevel
Architecture: any
-Depends: libkf5coreaddons5 (= ${binary:Version}),
+Multi-Arch: same
- Depends: libkf5coreaddons5 (= ${binary:Version}),
- libkf5coreaddons-bin-dev (= ${binary:Version}),
++Depends: libkf5coreaddons-bin-dev (= ${binary:Version}),
++ libkf5coreaddons5 (= ${binary:Version}),
qtbase5-dev (>= 5.4),
${shlibs:Depends}
Replaces: libkf5service-dev (<= 5.2.0)
@@@ -38,24 -36,6 +38,23 @@@ Description: KDE Frameworks 5 addons t
.
This package contains the development files for KCoreAddons.
+Package: libkf5coreaddons-bin-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
- Depends: ${shlibs:Depends}, ${misc:Depends}
++Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: libkf5coreaddons-dev (<< 5.10+git20150714)
+Breaks: libkf5coreaddons-dev (<< 5.10+git20150714)
+Description: KDE Frameworks 5 addons to QtCore - development files
+ KCoreAddons provides classes built on top of QtCore to perform various tasks
+ such as manipulating mime types, autosaving files, creating backup files,
+ generating random sequences, performing text manipulations such as macro
+ replacement, accessing user information and many more.
+ .
+ This package is part of KDE Frameworks 5.
+ .
+ This package contains the binary development files for KCoreAddons.
+
-
Package: libkf5coreaddons5
Architecture: any
Multi-Arch: same
--
kcoreaddons packaging
More information about the pkg-kde-commits
mailing list