[SCM] krdc packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-1-7-gb4f7958

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit b32f5345dd9aed7443ec97ebe6f0db549e7face9
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 666ebd3..630d542 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-krdc (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+krdc (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream RC release
   * Merge with Debian, remaning changes:
diff --git a/debian/control b/debian/control
index f66f781..0d0ec3a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,15 +17,15 @@ Build-Depends: cmake,
                pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.5
 Homepage: http://www.kde.org/
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/krdc.git/
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/krdc.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/krdc.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/krdc.git
 
 Package: krdc
 Section: net
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: freerdp-x11 (>= 1.0.2)
-Suggests: khelpcenter, krfb
+Suggests: khelpcenter4, krfb
 Description: Remote Desktop Connection client
  The KDE Remote Desktop Connection client can view and control a desktop
  session running on another system.  It can connect to Windows Terminal Servers
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 3821285..bb9f0ab 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
 version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/krdc-([\d.]+).tar.xz
-
-http://download.kde.org/unstable/applications/([\d.]+)/src/krdc-([\d.]+).tar.xz
+http://download.kde.org/stable/([\d.]+)/src/krdc-([\d.]+).tar.xz

-- 
krdc packaging