[SCM] kompare packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-7-g9a65ce3

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 6d49d2986ab677af309ec0c6052b7c0733e58948
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Dec 5 16:34:56 2014 +0100

    update to 14.11.97
---
 debian/.gitattributes       | 1 -
 debian/changelog            | 2 +-
 debian/control              | 6 +++---
 debian/source/local-options | 1 -
 debian/watch                | 4 +---
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 76569c9..5dfa458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kompare (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kompare (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream release
   * Merge with Debian, remaining changes:
diff --git a/debian/control b/debian/control
index 33e7762..2b49af2 100644
--- a/debian/control
+++ b/debian/control
@@ -15,14 +15,14 @@ Build-Depends: cmake,
                libkomparediff2-dev
 Standards-Version: 3.9.5
 Homepage: http://www.kde.org/
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/kompare.git/
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/kompare.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kompare.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kompare.git
 
 Package: kompare
 Architecture: any
 Section: devel
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: khelpcenter
+Suggests: khelpcenter4
 Replaces: libcvsservice0 (<<4:4.0.0)
 Breaks: libcvsservice0 (<<4:4.0.0)
 Description: file difference viewer
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes
diff --git a/debian/watch b/debian/watch
index 94d7887..512b7b5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
 version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/kompare-([\d.]+).tar.xz
-
-http://download.kde.org/unstable/applications/([\d.]+)/src/kompare-([\d.]+).tar.xz
+http://download.kde.org/stable/([\d.]+)/src/kompare-([\d.]+).tar.xz

-- 
kompare packaging