[SCM] kunitconversion packaging branch, master, updated. debian/5.37.0-2-81-gbba8005
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jan 2 18:53:31 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kunitconversion.git;a=commitdiff;h=4c3c73b
The following commit has been merged in the master branch:
commit 4c3c73b98261720c7ab876fcb6db72100358a85d
Merge: 4423aae62a57d30ff699309f9cd7190074055ea4 2f6751d00124a5651555887aec5bf17f39a4dd49
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Sat Jul 11 06:15:47 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
Conflicts:
debian/changelog
debian/control
debian/changelog | 8 ++++++++
debian/control | 6 +++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --cc debian/changelog
index 66a3b24,9b55aee..a6ea9c6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
+kunitconversion (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release
++ * Fix merge.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 08:25:41 -0700
+
+ kunitconversion (5.11.0-1) unstable; urgency=medium
+
+ * New upstream release (5.10.0).
+ * New upstream release (5.11.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Sat, 27 Jun 2015 12:58:43 +0200
+
kunitconversion (5.10.0-0ubuntu1) wily; urgency=medium
[ Maximiliano Curia ]
diff --cc debian/control
index 2d4db9f,bf8cdce..55493ef
--- a/debian/control
+++ b/debian/control
@@@ -5,8 -5,8 +5,8 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.12),
debhelper (>= 9),
- extra-cmake-modules (>= 5.10.0),
- libkf5i18n-dev (>= 5.12.0),
- extra-cmake-modules (>= 5.11.0~),
- libkf5i18n-dev (>= 5.11.0~),
++ extra-cmake-modules (>= 5.12.0~),
++ libkf5i18n-dev (>= 5.12.0~),
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev (>= 5.4)
Standards-Version: 3.9.6
@@@ -18,7 -18,7 +18,7 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
Package: libkf5unitconversion-dev
Section: libdevel
Architecture: any
- Depends: libkf5i18n-dev (>= 5.12.0),
-Depends: libkf5i18n-dev (>= 5.11.0~),
++Depends: libkf5i18n-dev (>= 5.12.0~),
libkf5unitconversion5 (= ${binary:Version}),
qtbase5-dev (>= 5.4),
${misc:Depends}
--
kunitconversion packaging
More information about the pkg-kde-commits
mailing list