[SCM] ktp-kded-integration-module packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-58-ge4e9742

Mon Feb 15 23:02:50 UTC 2016

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=e4e9742

The following commit has been merged in the kubuntu_xenial_archive branch:
commit e4e974291d8a4ed735d950916b0fa49720bc0525
Merge: 55853024e235a2f52d0d83f3aa4c8c16f98340e4 12df40e25e2349e21bf622b9981b66c487871929
Author: Clive Johnston <clivejo at aol.com>
Date:   Mon Feb 15 23:02:34 2016 +0000

    Merged with Debian and New upstream release
    
    - Added Kubuntu epoch

 debian/changelog                                | 73 +++++++++++++++++++++----
 debian/control                                  | 49 ++++-------------
 debian/copyright                                | 55 +++++++------------
 debian/kde-telepathy-integration-module.install |  6 +-
 debian/rules                                    | 15 ++++-
 debian/watch                                    |  4 +-
 6 files changed, 113 insertions(+), 89 deletions(-)

diff --cc debian/changelog
index 2355587,c4dcc7f..2458424

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,63 -1,59 +1,112 @@@
- ktp-kded-module (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++ktp-kded-integration-module (4:15.12.1-2ubuntu1) UNRELEASED; urgency=medium
 +
++  * Merged with Debian
++    - Added epoch used by Kubuntu
 +  * New upstream release
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:25:30 +0000
++ -- Clive Johnston <clivejo at aol.com>  Mon, 15 Feb 2016 22:59:48 +0000
++
+ ktp-kded-integration-module (15.12.1-2) experimental; urgency=medium
+ 
+   * Bump build dependencies.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Feb 2016 23:26:43 +0100
+ 
+ ktp-kded-integration-module (15.12.1-1) experimental; urgency=medium
+ 
+   [ Maximiliano Curia ]
+   * Update watch file.
+   * New upstream release (15.04.1).
+   * New upstream release (15.04.2).
+   * New upstream release (15.08.0).
+   * New upstream release (15.08.1).
+   * Bump Standards-Version to 3.9.6.
+   * New upstream release (15.08.2).
+   * New upstream release (15.12.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:23:14 +0100
+ 
+ ktp-kded-integration-module (15.08.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Diane Trout <diane at ghic.org>  Wed, 02 Dec 2015 23:01:00 -0800
+ 
+ ktp-kded-integration-module (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.
+   * Update copyright file.
+     - Add LGPL-2 block
+     - Remove po/* block
+   * Update build-dpends for change to KF5 and rename
+     libktpcommoninternalsprivate-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
+ 
+  -- Diane Trout <diane at ghic.org>  Sat, 07 Nov 2015 10:58:43 -0800
  
 +ktp-kded-module (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:56 +0100
 +
 +ktp-kded-module (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:58 +0100
 +
 +ktp-kded-module (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:42:42 +0100
 +
 +ktp-kded-module (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 11:19:24 +0100
 +
 +ktp-kded-module (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>  Wed, 10 Jun 2015 18:59:03 +0200
 +
- ktp-kded-integration-module (0.9.0-0ubuntu1) vivid; urgency=medium
+ ktp-kded-integration-module (0.9.0-1) unstable; urgency=medium
  
-   * New upstream release
+   [ Diane Trout ]
+   * New upstream release.
+   * Bump telepathy-qt build-dep to 0.9.5
+   * Bump libktpcommoninternalsprivate 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
  
-  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Oct 2014 13:14:02 +0100
+  -- Diane Trout <diane at ghic.org>  Sat, 25 Apr 2015 20:06:27 -0700
  
- ktp-kded-integration-module (0.8.80-1) UNRELEASED; urgency=medium
++ktp-kded-integration-module (0.9.0-0ubuntu1) vivid; urgency=medium
 +
-   * New upstream release.
-   * Bump telepathy-qt build-dep to 0.9.5
-   * Bump libktpcommoninternalsprivate build-dep to 0.8.80
-   * Change kde-telepathy-data dependency to source:Upstream-Version
++  * New upstream release
 +
-  -- Diane Trout <diane at ghic.org>  Sun, 21 Sep 2014 09:48:18 -0700
++ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Oct 2014 13:14:02 +0100
 +
  ktp-kded-integration-module (0.8.1-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 5da8fd1,4871a0b..23d5251
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,7 +1,7 @@@
 -Source: ktp-kded-integration-module
 +Source: ktp-kded-module
  Section: kde
  Priority: optional
- Maintainer: Debian/Kubuntu KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Diane Trout <diane at ghic.org>,
             Michał Zając <quintasan at kubuntu.org>,
             Mark Purcell <msp at debian.org>
@@@ -57,13 -39,3 +39,4 @@@ Description: Telepathy integration modu
   .
   This package is not meant to be used standalone. It is recommended
   to install the kde-telepathy metapackage instead.
 +
- Package: kde-telepathy-integration-module-dbg
- Architecture: any
- Section: debug
- Priority: extra
- Depends: kde-telepathy-integration-module (= ${binary:Version}),
-          ${misc:Depends}
- Description: Telepathy integration module for the KDE Workspace - debug symbols
-  This package provides the debug symbols for the KDE Telepathy
-  integration module.
diff --cc debian/watch
index 7e2045e,a8a69b6..5653665
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,4 +1,3 @@@
  version=3
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-kded-module-([\d.]+).tar.xz
- http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-kded-module-([\d.]+).tar.xz
 -
+ http://download.kde.org/stable/applications/([\d.]+)/src/ktp-kded-module-([\d.]+)\.tar\.(?x:bz2|xz)
+ http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-kded-module-([\d.]+)\.tar\.(?x:bz2|xz)

-- 
ktp-kded-integration-module packaging

