[SCM] kmix packaging branch, master, updated. debian/4.14.0-1-15-g024c7eb

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 46d553ac26eb15ec3a3afc45519cd4036980f62e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Feb 19 09:30:57 2015 +0100

    Tweak debian/changelog.
---
 debian/changelog | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1990ed..d1bb821 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,17 +7,11 @@ kmix (4:14.12.2-1~) UNRELEASED; urgency=medium
 kmix (4:14.12.2-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
-  * Remove unstable from watch file, uscan fails with 
+  * Remove unstable from watch file, uscan fails with
     remote site does not even have current version
-
- -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 09:37:29 -0800
-
-kmix (4:14.12.0-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New upstream release
   * Remove kdelibs5-dev depend version as there was not a new release.
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 12 Dec 2014 10:22:11 -0800
+ -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 09:37:29 -0800
 
 kmix (4:14.11.97-0ubuntu1) vivid; urgency=medium
 
@@ -27,11 +21,11 @@ kmix (4:14.11.97-0ubuntu1) vivid; urgency=medium
 
 kmix (4:14.11.95-0ubuntu1) vivid; urgency=medium
 
-  * Initial release for KDE applications 14.12 series 
+  * Initial release for KDE applications 14.12 series
    - Change maintainer to Debian/Kubuntu
-   - Fix Watch file applications locations 
+   - Fix Watch file applications locations
    - Fix VCS for new kde-applications location
-  * Debian merge, remaining changes: 
+  * Debian merge, remaining changes:
    - Keep kmix_showeverywhere.diff
    - Keep kmix.links
 
@@ -264,7 +258,7 @@ kmix (4:4.10.80-0ubuntu1) saucy; urgency=low
   * New upstream release
 
   [ Philip Muškovac ]
-  * Refresh kmix_showeverywhere.diff 
+  * Refresh kmix_showeverywhere.diff
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 21 Jun 2013 01:24:49 +0100
 
@@ -409,4 +403,3 @@ kmix (4:4.8.80-0ubuntu1) quantal; urgency=low
   * Initial release
 
  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 07 Jun 2012 14:22:19 +0200
-

-- 
kmix packaging