[SCM] ktp-contact-list packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-80-g233ed29

Tue Feb 16 19:32:57 UTC 2016

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=233ed29

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 233ed29e666eb2e582e9a46601742898d8342902
Merge: 73f733d8dfb50fc193f438946ed1dc9e451295a3 67b7c4d2a5f1a707e19a192fae81c8499c5e0f45
Author: Clive Johnston <clivejo at aol.com>
Date:   Tue Feb 16 19:32:37 2016 +0000

    Merged with Debian and New upstream release

 debian/changelog | 68 +++++++++++++++++++++++++++++++++++++++++++++++------
 debian/control   | 71 ++++++++++++++++++--------------------------------------
 debian/copyright | 51 +++-------------------------------------
 debian/rules     | 12 ++++++++--
 debian/watch     |  4 ++--
 5 files changed, 99 insertions(+), 107 deletions(-)

diff --cc debian/changelog
index 3474684,b0d30f6..395f180

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,69 -1,63 +1,123 @@@
- ktp-contact-list (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++ktp-contact-list (4:15.12.1-2ubuntu1) UNRELEASED; urgency=medium
 +
++  * Merged with Debian
++    - Added epoch for Kubunbu
 +  * New upstream release
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:23:56 +0000
++ -- Clive Johnston <clivejo at aol.com>  Tue, 16 Feb 2016 19:30:09 +0000
++
+ ktp-contact-list (15.12.1-2) experimental; urgency=medium
+ 
+   * Bump build dependencies.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Feb 2016 20:52:57 +0100
+ 
+ ktp-contact-list (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:21 +0100
+ 
+ ktp-contact-list (15.08.3-1) unstable; urgency=medium
+ 
+   [ Diane Trout ]
+   * New upstream release.
+ 
+  -- Diane Trout <diane at ghic.org>  Wed, 02 Dec 2015 21:37:12 -0800
+ 
+ ktp-contact-list (15.08.2-1) unstable; urgency=medium
+ 
+   * Apply homepage update patch from Matthew Cope
+   * Update watch file for KTps move to Applications.
+   * New upstream release.
+   * Use --fail-missing to make it easier to find not installed files.
+   * Update build-depends to use libtelepathy-qt5, libtelepathy-logger-qt-dev,
+     qtbase5, extra-cmake-modules and many kf5 libraries.
+   * Update copyright file, a few modules are now LGPL, the po/* files
+     are somewhere else and I added myself to the debian/ block
+   * Update install paths for ktp-contactlist
+   * 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
+ 
+  -- Diane Trout <diane at ghic.org>  Sat, 07 Nov 2015 10:44:51 -0800
  
 +ktp-contact-list (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:50:29 +0100
 +
 +ktp-contact-list (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:31:20 +0100
 +
 +ktp-contact-list (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:41:53 +0100
 +
 +ktp-contact-list (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 11:18:08 +0100
 +
 +ktp-contact-list (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * KDE Frameworks 5 port
 +    + Update watch file. Now released as part of applications.
 +    + Update rules to use pkg-kde-tools helper
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 13 May 2015 22:36:25 -0700
 +
+ ktp-contact-list (0.9.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update libktpcommoninternalsprivate-dev build-dep to 0.9.0
+   * Update Standards-Version to 3.9.6. No changes needed.
+   * Update copyright file.
+   * Update debian/watch file to use http://download.kde.org
+ 
+  -- Diane Trout <diane at ghic.org>  Sat, 25 Apr 2015 19:47:52 -0700
+ 
 +ktp-contact-list (0.9.0-0ubuntu1) vivid; urgency=medium
 +
 +  * Merge from Debian git, no changes
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Oct 2014 13:14:01 +0100
 +
- ktp-contact-list (0.8.80-1) UNRELEASED; urgency=medium
+ ktp-contact-list (0.8.1-2) unstable; urgency=medium
  
-   * New upstream release.
-   * Update libktpcommoninternalsprivate-dev build-dep to 0.8.80
-   * Change kde-telepathy-data to source:Upstream-Version
+   * Add kde-telepathy-kpeople as a dependency to ktp-contactlist
+     this should force installing of the kpeople components to
+     prevent the contact list from being empty.
+     (Closes: #753305)
  
-  -- Diane Trout <diane at ghic.org>  Sun, 21 Sep 2014 10:56:47 -0700
+  -- Diane Trout <diane at ghic.org>  Tue, 21 Oct 2014 22:07:01 -0700
  
 +ktp-contact-list (0.8.1-1ubuntu1) utopic; urgency=low
 +
 +  * Merge from Debian unstable.  Remaining changes:
 +    - debian/patches/upstream_Dont-crash-on-account-manager-not-ready.diff:
 +      + Do not load dialogs if account manager is not ready.
 +
 + -- Artur Rona <ari-tczew at ubuntu.com>  Wed, 09 Jul 2014 08:06:01 +0200
 +
  ktp-contact-list (0.8.1-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/watch
index 365d648,65574de..eed80fb
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,4 +1,3 @@@
  version=3
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-contact-list-([\d.]+).tar.xz
- http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-contact-list-([\d.]+).tar.xz
 -
+ http://download.kde.org/stable/applications/([\d.]+)/src/ktp-contact-list-([\d.]+)\.tar\.(?:bz2|xz)
+ http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-contact-list-([\d.]+)\.tar\.(?:bz2|xz)

-- 
ktp-contact-list packaging

