[SCM] kompare packaging branch, kubuntu_unstable, updated. debian/4.14.0-1-29-ga5dd084

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit a5dd084c04929bb1e583fb3ca8b28294fcfa24bb
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Mon Apr 20 09:40:04 2015 -0700

    Add epoch to kpart5-kompare Breaks/Replaces against kompare.
    merge
    * Add epoch to kpart5-kompare Breaks/Replaces against kompare.
    * Fix kompare.install file so it doesn't share files with kpart5-
      kompare
---
 debian/changelog       | 6 ++++++
 debian/control         | 4 ++--
 debian/kompare.install | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49ca2e6..28188dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
 kompare (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Scarlett Clark ]
   * New upstream release
 
+  [ José Manuel Santamaría Lema ]
+  * Add epoch to kpart5-kompare Breaks/Replaces against kompare.
+  * Fix kompare.install file so it doesn't share files with kpart5-
+    kompare
+
  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 15 Apr 2015 12:03:32 -0700
 
 kompare (4:14.12.3-0ubuntu1) vivid; urgency=medium
diff --git a/debian/control b/debian/control
index cb182e7..e40776b 100644
--- a/debian/control
+++ b/debian/control
@@ -44,8 +44,8 @@ Package: kpart5-kompare
 Architecture: any
 Section: devel
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kompare (<< 14.12.3+git20150408)
-Replaces: kompare (<< 14.12.3+git20150408)
+Breaks: kompare (<< 4:14.12.3+git20150408)
+Replaces: kompare (<< 4:14.12.3+git20150408)
 Description: file difference viewer - kpart
  Kompare displays the differences between files.  It can compare the
  contents of files or directories, as well as create, display, and merge patch
diff --git a/debian/kompare.install b/debian/kompare.install
index aa06b14..59c3004 100644
--- a/debian/kompare.install
+++ b/debian/kompare.install
@@ -1,5 +1,4 @@
 usr/bin/kompare
 usr/share/applications/kompare.desktop
 usr/share/doc/
-usr/share/kompare/
 usr/share/kompare/kompareui.rc

-- 
kompare packaging