Hi,

when porting kompare from kubuntu_vivid_archive for siduction, I had to do 
some changes on the package, otherwise it woudln't be upgradeable nor
installable.

I have pushed the proposed change to this repository:
https://gitlab.com/siduction-kde-applications/kompare

in the kubuntu_vivid_backports_tmp branch:
https://gitlab.com/siduction-kde-applications/kompare/commits/kubuntu_vivid_backports_tmp

Also I'm attaching the patch retrieved with git format-patch.
From c358918185483ca5bc8c3449bf0d1fe68f4d2ef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa=20Lema?=
 <panfa...@gmail.com>
Date: Sat, 18 Apr 2015 17:21:51 +0200
Subject: [PATCH 1/3] Add epoch to kpart5-kompare Breaks/Replaces against
 kompare.

---
 debian/changelog | 4 ++++
 debian/control   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49ca2e6..9523490 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 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.
+
  -- Scarlett Clark <sgcl...@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
-- 
2.1.4

From 06d9924a6f1e3aea663ed38c594466e2a051b711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa=20Lema?=
 <panfa...@gmail.com>
Date: Sat, 18 Apr 2015 17:27:24 +0200
Subject: [PATCH 2/3] Add missing changelog entry.

---
 debian/changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9523490..c9cc2f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ kompare (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
   [ Scarlett Clark ]
   * New upstream release
 
+  [ Harald Sitter ]
+  * Split package; new binary packages: kpart5-kompare, libkompareinterface-dev 
+    and libkompareinterface5.
+
   [ José Manuel Santamaría Lema ]
   * Add epoch to kpart5-kompare Breaks/Replaces against kompare.
 
-- 
2.1.4

From 243eb7ef39ebfb69723c2630e7d87e890d9a480d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa=20Lema?=
 <panfa...@gmail.com>
Date: Sat, 18 Apr 2015 19:08:25 +0200
Subject: [PATCH 3/3] Fix kompare.install file so it doesn't share files with
 kpart5-kompare

---
 debian/changelog       | 2 ++
 debian/kompare.install | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c9cc2f4..f2990e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ kompare (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
 
   [ 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 <sgcl...@kubuntu.org>  Wed, 15 Apr 2015 12:03:32 -0700
 
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
-- 
2.1.4

Attachment: signature.asc
Description: This is a digitally signed message part.

-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel

Reply via email to