[SCM] ktp-contact-applet packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-61-g548aea5

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=548aea5

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 548aea530a858f650fe192a923c9803ed937c938
Merge: a6bc137a33f194c055322f6d347283c1fb99acd4 44af4f40a14523500f1b4624bd4b2d97a33c0025
Author: Clive Johnston <clivejo at aol.com>
Date:   Tue Feb 16 22:16:05 2016 +0000

    Merged with Debian and New upstream release

 debian/changelog | 61 ++++++++++++++++++++++++++++-------
 debian/control   | 37 ++++++++-------------
 debian/copyright | 98 ++++----------------------------------------------------
 debian/rules     | 12 +++++--
 debian/watch     |  3 +-
 5 files changed, 80 insertions(+), 131 deletions(-)

diff --cc debian/changelog
index 2bb6955,63f2230..c079074
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,61 -1,47 +1,98 @@@
- ktp-desktop-applets (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++ktp-desktop-applets (4:15.12.1-1ubuntu1) UNRELEASED; urgency=medium
 +
++  * Merged with Debian
++    - Added epoch for Kubuntu
 +  * New upstream release
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:24:44 +0000
++ -- Clive Johnston <clivejo at aol.com>  Tue, 16 Feb 2016 22:13:22 +0000
++
+ ktp-desktop-applets (15.12.1-1) experimental; urgency=medium
+ 
+   [ Maximiliano Curia ]
+   * Update watch file.
+   * Bump Standards-Version to 3.9.6.
+   * New upstream release (15.12.0).
+   * New upstream release (15.12.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:23:52 +0100
+ 
+ ktp-desktop-applets (15.08.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Diane Trout <diane at ghic.org>  Wed, 02 Dec 2015 21:55:30 -0800
+ 
+ ktp-desktop-applets (15.08.2-1) unstable; urgency=medium
+ 
+   * Apply homepage update patch from Matthew Cope
+   * Update watch file for KTp's move to Applications.
+   * New upstream release. (Closes: #791894)
+   * Update build dependencies for move to Qt5 and rename of
+     libktpcommoninternalsprivate-dev to libktp-dev
+   * Use dhmk from pkg-kde-tools to build ktp.
+     - Change maintainer to debian-qt-kde
+     - Update debian/rules
+   * Add KDE's unstable download url to watch file
+   * kde-telepathy-declarative was renamed to qml-module-org-kde-
+     telepathy
+ 
+  -- Diane Trout <diane at ghic.org>  Sat, 07 Nov 2015 10:54:13 -0800
  
 +ktp-desktop-applets (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:51:14 +0100
 +
 +ktp-desktop-applets (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 17:32:02 +0100
 +
 +ktp-desktop-applets (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:42:19 +0100
 +
 +ktp-desktop-applets (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * KDE Frameworks 5 port
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 11:18:43 +0100
 +
 +ktp-desktop-applets (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 10 Jun 2015 18:58:32 +0200
 +
+ ktp-desktop-applets (0.9.0-1) unstable; urgency=medium
+ 
+   [ Diane Trout ]
+   * New upstream release.
+   * Update copyright file.
+   * Update build-depends for libktpcommoninternalsprivate-dev to 0.9.0
+   * Update depends for kde-telepathy-declarative to source:Upstream-Version
+   * Update Standards-Version to 3.9.6. No changes needed.
+   * Update debian/watch file to use http://download.kde.org
+ 
+  -- Diane Trout <diane at ghic.org>  Sat, 25 Apr 2015 19:58:23 -0700
+ 
 +ktp-desktop-applets (0.9.0-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +  * Merge with Debian unstable, no changes
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Oct 2014 13:14:02 +0100
 +
- ktp-desktop-applets (0.8.80-1) UNRELEASED; urgency=medium
- 
-   * New upstream release.
-   * Update copyright file.
-   * Update build-depends for libktpcommoninternalsprivate-dev to 0.8.80
-   * Update depends for kde-telepathy-declarative to source:Upstream-Version
- 
-  -- Diane Trout <diane at ghic.org>  Sat, 20 Sep 2014 20:41:41 -0700
- 
  ktp-desktop-applets (0.8.1-1) unstable; urgency=medium
  
    * New upstream release
diff --cc debian/watch
index 9820bb6,13b09a5..808d54e
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,3 +1,2 @@@
  version=3
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-desktop-applets-([\d.]+).tar.xz
- http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-desktop-applets-([\d.]+).tar.xz
 -
+ http://download.kde.org/stable/applications/([\d.]+)/src/ktp-desktop-applets-([\d.]+)\.tar\.xz

-- 
ktp-contact-applet packaging