[SCM] ktp-approver packaging branch, kubuntu_xenial_archive, updated. debian/15.08.3-1-51-g00dda4c

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=00dda4c

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 00dda4c18f6c6323b64478d275a21b4546e96517
Merge: 2e878efc5a0d4a0ed4f33a69ddec65c1728a3410 d79cb4224611a0133850b9fad46dd64978809068
Author: Clive Johnston <clivejo at aol.com>
Date:   Tue Feb 16 11:54:52 2016 +0000

    Merged with Debian and New upstream release

 debian/changelog                      | 57 ++++++++++++++++++++++++++++++++---
 debian/control                        | 42 ++++++++++++--------------
 debian/copyright                      | 53 ++++++++++++++------------------
 debian/kde-telepathy-approver.install |  5 ++-
 debian/rules                          | 14 +++++++--
 debian/watch                          |  4 +--
 6 files changed, 112 insertions(+), 63 deletions(-)

diff --cc debian/changelog
index bb33fbb,1b11b54..5a9f46f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,56 -1,51 +1,105 @@@
- ktp-approver (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++ktp-approver (15.12.1-1ubuntu1) UNRELEASED; urgency=medium
 +
-   * New upstream release
++  * Merged with Debian
++  * New upstream release 
++
++ -- Clive Johnston <clivejo at aol.com>  Tue, 16 Feb 2016 11:52:28 +0000
++
+ ktp-approver (15.12.1-1) experimental; urgency=medium
+ 
+   * Update watch file.
+   * New upstream release (15.12.0).
+   * New upstream release (15.12.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:24:38 +0100
+ 
+ ktp-approver (15.08.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Diane Trout <diane at ghic.org>  Wed, 02 Dec 2015 21:29:37 -0800
  
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:22:28 +0000
+ ktp-approver (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.
+   * Update build dependencies to include:
+     - qtbase5-dev, extra-cmake-modules, libsignon-qt5-dev,
+       libtelepathy-qt5-dev, libtelepathy-logger-qt-dev
+       and several libkf5 libraries.
+   * Update debian/copyright.
+     - Add myself top debian/* copyright.
+     - Add LGPL-2+ block for src/ktp_approver_debug.*
+     - remove po/* block.
+   * Adjust paths in kde-telepathy-approver for KF5 locations.
+   * Use --fail-missing in rules to make it easier for me to find
+     whats missing.
+   * Use dhmk from pkg-kde-tools to build ktp.
+     - Change maintainer to debian-qt-kde
+     - Update debian/rules
+     - Update plugins path to qt5/plugins.
+   * Add KDE's unstable download url to watch file
+ 
+  -- Diane Trout <diane at ghic.org>  Sat, 07 Nov 2015 10:35:45 -0800
  
 +ktp-approver (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:49:21 +0100
 +
 +ktp-approver (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:30:00 +0100
 +
 +ktp-approver (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:41:12 +0100
 +
 +ktp-approver (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 11:17:11 +0100
 +
 +ktp-approver (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * KDE Frameworks 5 port
 +    + Update rules for new pkg-kde-tools helpers
 +    + Update watch; now part of applications releases
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * Vivid backport
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 19:27:41 +0200
 +
+ ktp-approver (0.9.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Change kde-telepathy-data depends to source:Upstream-Version
+   * Update Standards-Version to 3.9.6. No changes needed.
+   * Update debian/copyright.
+   * Update debian/watch file to use http site.
+ 
+  -- Diane Trout <diane at ghic.org>  Sat, 25 Apr 2015 20:17:10 -0700
+ 
 +ktp-approver (0.9.0-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Oct 2014 13:14:00 +0100
 +
  ktp-approver (0.8.1-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/watch
index 1ab8121,0f3a4d3..ccbc302
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,4 +1,3 @@@
  version=3
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-approver-([\d.]+).tar.xz
- http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-approver-([\d.]+).tar.xz
 -
+ http://download.kde.org/stable/applications/([\d.]+)/src/ktp-approver-([\d.]+)\.tar\.(?:bz2|xz)
+ http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-approver-([\d.]+)\.tr.(?:bz2|xz)

-- 
ktp-approver packaging