[SCM] ktp-auth-handler packaging branch, kubuntu_stable, updated. ubuntu/4%15.08.2-0ubuntu1-80-g160b25a

Kubuntu CI (Harald Sitter) kubuntu-ci-guest at moszumanska.debian.org
Tue Feb 16 13:11:56 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=160b25a

The following commit has been merged in the kubuntu_stable branch:
commit 160b25ac6ab2aee315fdb9b4ee2d2183020ee093
Merge: 1ef2284329acdda1bd85c40ea5509d3f6ee85648 2d74b247a1666795f7e896f7bcd77e2c924883b4
Author: Clive Johnston <clivejo at aol.com>
Date:   Tue Feb 16 13:01:58 2016 +0000

    Merged with Debian and New upstream release

 debian/changelog                          | 125 +++++++++++++++++++++---------
 debian/control                            |  49 ++++++------
 debian/copyright                          |  55 +------------
 debian/kde-telepathy-auth-handler.install |   4 +-
 debian/rules                              |  12 ++-
 debian/watch                              |   4 +-
 6 files changed, 127 insertions(+), 122 deletions(-)

diff --cc debian/changelog
index c5fa832,1b85c5b..e8fc2a6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,63 -1,57 +1,112 @@@
- ktp-auth-handler (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++ktp-auth-handler (4:15.12.1-2ubuntu1) UNRELEASED; urgency=medium
 +
++  * Merged with Debian
++    - Added epoch for Kubuntu
 +  * New upstream release
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:22:58 +0000
++ -- Clive Johnston <clivejo at aol.com>  Tue, 16 Feb 2016 12:59:37 +0000
++
+ ktp-auth-handler (15.12.1-2) experimental; urgency=medium
+ 
+   * Bump build dependencies.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Feb 2016 20:11:49 +0100
+ 
+ ktp-auth-handler (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-auth-handler (15.08.3-1) unstable; urgency=medium
+ 
+   [ Diane Trout ]
+   * New upstream release.
+ 
+  -- Diane Trout <diane at ghic.org>  Wed, 02 Dec 2015 21:34:42 -0800
+ 
+ ktp-auth-handler (15.08.2-1) unstable; urgency=medium
+ 
+   * Apply homepage update patch from Matthew Cope
+   * Update watch file to for KTp's move to applications.
+   * New upstream version. (Closes: #784488)
+   * Update build-depends for the change to KF5.
+     (Move to Qt5 versions and list specific kf5 modules).
+   * Update copyright file. (Translations are in a new package).
+   * Update kde-telepathy-auth-handler for new KF5 locations.
+   * Use --fail-missing to make it easier to find not installed files.
+   * Update for rename of ktpcommoninternalsprivate-dev to libktp-dev
+   * 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
+   * Remove block in copyright file refering to removed files.
+ 
+  -- Diane Trout <diane at ghic.org>  Sat, 07 Nov 2015 10:40:47 -0800
  
 +ktp-auth-handler (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:42 +0100
 +
 +ktp-auth-handler (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:34 +0100
 +
 +ktp-auth-handler (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:41:24 +0100
 +
 +ktp-auth-handler (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 11:17:28 +0100
 +
 +ktp-auth-handler (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * KDE Frameworks 5 port
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * Vivid backport
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 19:28:07 +0200
 +
+ ktp-auth-handler (0.9.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update build-depends ktpcommoninteranslprivate-dev to 0.9.0
+   * Update kde-telepathy-data version to be set by source:Upstream-Version
+   * Update copyright file
+   * 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:44:41 -0700
+ 
 +ktp-auth-handler (0.9.0-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +  * Merge with Debian, no changes
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Oct 2014 13:14:00 +0100
 +
- ktp-auth-handler (0.8.80-1) UNRELEASED; urgency=medium
- 
-   * New upstream release.
-   * Update build-depends ktpcommoninteranslprivate-dev to 0.8.80
-   * Update kde-telepathy-data version to be set by source:Upstream-Version
- 
-  -- Diane Trout <diane at ghic.org>  Sat, 20 Sep 2014 20:26:22 -0700
 +
  ktp-auth-handler (0.8.1-1) unstable; urgency=medium
  
    * New upstream release
@@@ -67,136 -61,35 +116,136 @@@
  
   -- Diane Trout <diane at ghic.org>  Fri, 16 May 2014 20:46:53 -0700
  
- ktp-auth-handler (0.7.0-1) unstable; urgency=low
- 
-   * Add Suggests: libqca2-plugin-ossl
-   * New upstream version.
-   * Bump Build-Depends ktpcommoninternalsprivate-dev to 0.7.0
-   * Bump depends kde-telepathy-data to >= 0.7
-   * Update copyright file
- 
-  -- Diane Trout <diane at ghic.org>  Wed, 04 Dec 2013 21:52:54 -0800
- 
- ktp-auth-handler (0.6.3-1) unstable; urgency=low
- 
-   [ Diane Trout ]
-   * Add libqca2 dependency
-   * Imported Upstream version 0.6.2
-   * Set Uploaders to Diane Trout and Michał Zając
-   * Include all telepathy client and d-bus configuration files.
-             This adds KTp.ConfAuthObserver and KTp.TLSHandler.
-   * Update Standards-Version to 3.9.4. No changes needed.
-   * Bump build-dep to 0.6.2
-   * Update watch file as KDE-Telepathy is now in KDE stable.
- 
-   [ Mark Purcell ] 
-   * Imported Upstream version 0.6.3
-   * Add myself to Uploaders
-   * Update Build-Depends: libktpcommoninternalsprivate-dev (>= 0.6.3)
- 
-  -- Mark Purcell <msp at debian.org>  Sun, 11 Aug 2013 10:22:29 +1000
- 
 +ktp-auth-handler (0.8.1-0ubuntu1) utopic; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 28 Apr 2014 17:06:07 +0200
 +
 +ktp-auth-handler (0.8.0-0ubuntu1) trusty; urgency=medium
 +
 +  * New upstream release (LP: #1297351)
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 01 Apr 2014 14:51:15 +0200
 +
 +ktp-auth-handler (0.7.80-0ubuntu1) trusty; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 18 Feb 2014 00:13:27 +0100
 +
 +ktp-auth-handler (0.7.1-0ubuntu1) trusty; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 29 Jan 2014 19:45:16 +0100
 +
+ ktp-auth-handler (0.7.0-1) unstable; urgency=low
+ 
+   * Add Suggests: libqca2-plugin-ossl
+   * New upstream version.
+   * Bump Build-Depends ktpcommoninternalsprivate-dev to 0.7.0
+   * Bump depends kde-telepathy-data to >= 0.7
+   * Update copyright file
+ 
+  -- Diane Trout <diane at ghic.org>  Wed, 04 Dec 2013 21:52:54 -0800
+ 
 +ktp-auth-handler (0.7.0-0ubuntu2) trusty; urgency=low
 +
 +  * Add libqca2-plugin-ossl to kde-telepathy-auth-handler Depends since
 +    it is a runtime dependency
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 07 Nov 2013 17:06:18 +0100
 +
 +ktp-auth-handler (0.7.0-0ubuntu1) trusty; urgency=low
 +
 +  * New upstream release
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 29 Oct 2013 12:45:57 +0100
 +
+ ktp-auth-handler (0.6.3-1) unstable; urgency=low
+ 
+   [ Diane Trout ]
+   * Add libqca2 dependency
+   * Imported Upstream version 0.6.2
+   * Set Uploaders to Diane Trout and Michał Zając
+   * Include all telepathy client and d-bus configuration files.
+             This adds KTp.ConfAuthObserver and KTp.TLSHandler.
+   * Update Standards-Version to 3.9.4. No changes needed.
+   * Bump build-dep to 0.6.2
+   * Update watch file as KDE-Telepathy is now in KDE stable.
+ 
+   [ Mark Purcell ]
+   * Imported Upstream version 0.6.3
+   * Add myself to Uploaders
+   * Update Build-Depends: libktpcommoninternalsprivate-dev (>= 0.6.3)
+ 
+  -- Mark Purcell <msp at debian.org>  Sun, 11 Aug 2013 10:22:29 +1000
+ 
 +ktp-auth-handler (0.6.3-0ubuntu1) saucy; urgency=low
 +
 +  * New upstream release (LP: #1208837)
 +  * Bump on libktpcommoninternalsprivate-dev 
 +
 + -- Howard Chan <smartboyhw at gmail.com>  Tue, 06 Aug 2013 21:31:01 +0800
 +
 +ktp-auth-handler (0.6.2-0ubuntu1) saucy; urgency=low
 +
 +  * New upstream release
 +  * Bump on libktpcommoninternalsprivate-dev
 +
 + -- Michał Zając <quintasan at kubuntu.org>  Fri, 21 Jun 2013 14:50:31 +0200
 +
 +ktp-auth-handler (0.6.1-0ubuntu1) raring; urgency=low
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 17 Apr 2013 10:31:37 +0100
 +
 +ktp-auth-handler (0.6.0-0ubuntu1) raring; urgency=low
 +
 +  * New upstream release
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 03 Apr 2013 11:14:45 +0100
 +
 +ktp-auth-handler (0.5.80-0ubuntu1) raring; urgency=low
 +
 +  * New upstream release
 +    - Update install files
 +    - Add libqca2-dev as build-dep
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 07 Mar 2013 16:28:21 +0000
 +
 +ktp-auth-handler (0.5.3-0ubuntu1) raring; urgency=low
 +
 +  * New upstream release
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 18 Feb 2013 16:20:26 +0530
 +
 +ktp-auth-handler (0.5.2-0ubuntu1) raring; urgency=low
 +
 +  * New upstream release
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 19 Dec 2012 00:17:55 +0530
 +
 +ktp-auth-handler (0.5.1-0ubuntu1) quantal-proposed; urgency=low
 +
 +  * New upstream release
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 05 Oct 2012 03:36:10 +0530
 +
 +ktp-auth-handler (0.5.0-0ubuntu1) quantal; urgency=low
 +
 +  * New upstream release
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 26 Aug 2012 12:42:10 +0530
 +
 +ktp-auth-handler (0.4.1-0ubuntu1) quantal; urgency=low
 +
 +  * New upstream release
 +
 + -- Michal Zajac <quintasan at kubuntu.org>  Tue, 31 Jul 2012 18:26:46 +0200
 +
  ktp-auth-handler (0.4.0-1) unstable; urgency=low
  
    * Initial release.
diff --cc debian/control
index 489e1f2,17a8bea..8cb5ced
--- a/debian/control
+++ b/debian/control
@@@ -28,9 -32,11 +32,11 @@@ Vcs-Browser: http://anonscm.debian.org/
  
  Package: kde-telepathy-auth-handler
  Architecture: any
- Depends: kde-telepathy-data, ${misc:Depends}, ${shlibs:Depends}
+ Depends: kde-telepathy-data (>= ${source:Upstream-Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
  Recommends: kde-telepathy
 -Suggests: libqca2-plugin-ossl
 +Suggests: libqca-qt5-2-plugins
  Description: KDE Telepathy authentication handler
   This package provides a Telepathy handler for the ServerAuthentication
   and ServerTLSConnection Telepathy channel types, which means that it

-- 
ktp-auth-handler packaging



More information about the pkg-kde-commits mailing list