[SCM] libkface packaging branch, master, updated. 697799100e66a9b070823e6919195a75f82ff833

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkface.git;a=commitdiff;h=d093472

The following commit has been merged in the master branch:
commit d09347204e0b0c8585833587bd41da36f5e4c6b1
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 27 15:19:31 2015 +0100

    Not the best merge
---
 debian/changelog | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5ef71e..e57ea83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,20 @@
+libkface (4:14.12.2-2~) UNRELEASED; urgency=medium
+
+  * Add Breaks/Replaces with digikam-data.
+
+ -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 18:35:46 +0100
+
 libkface (4:14.12.3-0ubuntu1) vivid; urgency=medium
 
-  * Add back kdelibs parent version depend. 
-  * Fix the maintainer field to the new 
-    standard for debian git hosted apps. 
+  * Add back kdelibs parent version depend.
+  * Fix the maintainer field to the new
+    standard for debian git hosted apps.
   * New upstream release
-  * Fix kdelibs5 version in build depends. 
+  * Fix kdelibs5 version in build depends.
   * Batchpatch symbols - Removed  #MISSING: 4:14.14.3# (optional=templinst)
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:23:09 -0700
 
-libkface (4:14.12.2-2~) UNRELEASED; urgency=medium
-
-  * Add Breaks/Replaces with digikam-data.
-
- -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 18:35:46 +0100
-
 libkface (4:14.12.2-1) experimental; urgency=medium
 
   [ Scarlett Clark ]

-- 
libkface packaging