[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.12.4-1-2-gea3d1a3
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Apr 30 10:18:12 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git;a=commitdiff;h=ea3d1a3
The following commit has been merged in the master branch:
commit ea3d1a345bdfc1e9e005fdf590dce5288edca411
Merge: 74f366b8ca0973faf9aef813e6a05e403b2cd115 67dfcdbde6a365f700029924cbaaf983c808d61b
Author: Maximiliano Curia <maxy at debian.org>
Date: Wed Apr 30 12:17:41 2014 +0200
Merge branch 'kde4.12'
Conflicts:
debian/changelog
debian/changelog | 21 +++++++++++++++++++--
debian/control | 7 +++----
debian/kdepim-runtime.install | 42 +++++++++++-------------------------------
debian/tests/control | 3 ++-
4 files changed, 35 insertions(+), 38 deletions(-)
diff --cc debian/changelog
index 64a947e,037db09..f3b8cc9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,24 +1,25 @@@
- kdepim-runtime (4:4.12.2-1) UNRELEASED; urgency=medium
+ kdepim-runtime (4:4.12.4-1) unstable; urgency=medium
* New upstream release.
+ * Update install files.
- -- Maximiliano Curia <maxy at debian.org> Tue, 04 Feb 2014 19:03:08 +0100
+ -- Maximiliano Curia <maxy at debian.org> Mon, 28 Apr 2014 12:23:48 +0200
+
+ kdepim-runtime (4:4.12.3-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 04 Mar 2014 00:06:52 +0100
+
+ kdepim-runtime (4:4.12.2-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Update install files.
+ * Update build dependencies.
+ * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 10 Feb 2014 11:31:30 +0100
++>>>>>>> kde4.12
kdepim-runtime (4:4.11.5-1) unstable; urgency=medium
--
KDE PIM Runtime module packaging
More information about the pkg-kde-commits
mailing list