[SCM] kopete packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-2-8-g5b90303

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 935807ac38a42109314b3409aee5e5000f91c804
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            | 4 +---
 debian/control              | 8 ++++----
 debian/source/local-options | 1 -
 debian/watch                | 4 +---
 5 files changed, 6 insertions(+), 12 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 850a571..80a2ec7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,10 @@
-kopete (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kopete (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream RC release
   * Merge with Debian, remaining changes:
     - build-dep on libgnutls-dev
     - build-dep on libboost1.55-dev
     - build-dep on libkleo4
-    - add cypto files to .install
-    - kopete recommends kopete-message-indicator
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 28 Nov 2014 19:23:42 +0100
 
diff --git a/debian/control b/debian/control
index 5fd53f4..a8d611f 100644
--- a/debian/control
+++ b/debian/control
@@ -47,8 +47,8 @@ Build-Depends: cmake,
 Standards-Version: 3.9.5
 XS-Testsuite: autopkgtest
 Homepage: http://www.kde.org/
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/kopete.git/
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/kopete.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kopete.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kopete.git
 
 Package: libkopete4
 Section: libs
@@ -69,8 +69,8 @@ Package: kopete
 Section: net
 Architecture: any
 Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
-Recommends: libqca2-plugin-ossl, libqt4-sql-sqlite, kopete-message-indicator
-Suggests: kdeartwork-emoticons, khelpcenter, texlive-latex-base, imagemagick
+Recommends: libqca2-plugin-ossl, libqt4-sql-sqlite
+Suggests: kdeartwork-emoticons, khelpcenter4, texlive-latex-base, imagemagick
 Description: instant messaging and chat application
  Kopete is an instant messaging and chat application with support for a wide
  variety of services, such as AIM, Yahoo, ICQ, MSN, and Jabber.  Advanced
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 51b67b2..30a7221 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
 version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/kopete-([\d.]+).tar.xz
-
-http://download.kde.org/unstable/applications/([\d.]+)/src/kopete-([\d.]+).tar.xz
+http://download.kde.org/stable/([\d.]+)/src/kopete-([\d.]+).tar.xz

-- 
kopete packaging