[SCM] ktp-text-ui packaging branch, kubuntu_stable, updated. ubuntu/4%15.08.2-0ubuntu1-91-ga0d92c2

Kubuntu CI (Harald Sitter) kubuntu-ci-guest at moszumanska.debian.org
Mon Feb 15 22:10:51 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=a0d92c2

The following commit has been merged in the kubuntu_stable branch:
commit a0d92c21d1abbfb91cf442c1c029fad38a801213
Merge: dc907f7652277cf811e8c9e7f75959c42b8b54ee 633eaac6b8f1262eda866262fc97e9bb676558ba
Author: Clive Johnston <clivejo at aol.com>
Date:   Mon Feb 15 21:46:39 2016 +0000

    Merged with Debian and New upstream release

 debian/changelog                               | 108 ++++++++++++++------
 debian/control                                 |  48 +++------
 debian/copyright                               | 130 ++++++-------------------
 debian/kde-telepathy-text-ui.install           |  21 +++-
 debian/kde-telepathy-text-ui.linktrees         |   1 +
 debian/kde-telepathy-text-ui.lintian-overrides |   9 +-
 debian/rules                                   |  13 ++-
 debian/watch                                   |   2 +-
 8 files changed, 157 insertions(+), 175 deletions(-)

diff --cc debian/changelog
index 19e4bef,83a6652..dfd6b48
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,79 -1,69 +1,127 @@@
- ktp-text-ui (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++ktp-text-ui (4:15.12.1-1ubuntu1) UNRELEASED; urgency=medium
 +
-   * New upstream release
++  * Merged with Debian
++    - Added epoch which only seems to be used in Kubuntu
++  * New upstream release 
++
++ -- Clive Johnston <clivejo at aol.com>  Mon, 15 Feb 2016 21:19:13 +0000
++
+ ktp-text-ui (15.12.1-1) experimental; urgency=medium
  
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:26:18 +0000
+   [ 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:22:47 +0100
  
 +ktp-text-ui (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:52:33 +0100
 +
 +ktp-text-ui (4:15.08.1-0ubuntu1) wily; urgency=medium
++  [ Scarlett Clark ]
++  * Fix random crash (LP #1493704) and KDE #347313 by  
++    adding runtime dependency to libkf5emonticons-bin. 
 +
++  [ Clive Johnston ]
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 17:34:10 +0100
 +
- ktp-text-ui (4:15.08.0-0ubuntu2) UNRELEASED; urgency=medium
- 
-   * Fix random crash (LP #1493704) and KDE #347313 by 
-     adding runtime dependency to libkf5emonticons-bin. 
- 
-  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 09 Sep 2015 09:50:05 +0200
- 
 +ktp-text-ui (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:43:08 +0100
 +
 +ktp-text-ui (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 11:20:00 +0100
 +
 +ktp-text-ui (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * KDE Frameworks 5 port
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 10 Jun 2015 18:59:58 +0200
 +
- ktp-text-ui (0.9.0-0ubuntu1) vivid; urgency=medium
+ ktp-text-ui (15.08.3-1) unstable; urgency=medium
  
-   * New upstream release
-   * Merge with Debian git, no changes
-   * Update 02_ktpchat_soversion.diff to match upstream Git
+   * New upstream release.
+   * Use version of libkf5emoticons that forces emoticons-bin dependency
+     (Closes: #805453)
  
-  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Oct 2014 13:14:03 +0100
+  -- Diane Trout <diane at ghic.org>  Sat, 05 Dec 2015 11:08:11 -0800
+ 
+ ktp-text-ui (15.08.2-1) unstable; urgency=medium
  
- ktp-text-ui (0.8.80-1) UNRELEASED; urgency=medium
+   * Update watch file for KTp's move to Applications
+   * New upstream release. (Closes: #784489)
+   * Update build-depends for KF5 and rename of
+     libktpcommoninternalsprivate-dev to libktp-dev
+   * Update copyright file
+     - Remove Files-Excluded, upstream fixed
+     - Remove cmake/* as it was removed
+     - Remove all of the po/* blocks
+   * Use dhmk from pkg-kde-tools to build ktp.
+     - Change maintainer to debian-qt-kde
+     - Update debian/rules
+   * Remove kde-telepathy-text-ui.links scriptaculous was removed and
+     jquery is being handled by kde-telepathy-text-ui.linktree
+   * Update install paths for KF5 locations.
+   * Don't apply 02_ktpchat_soversion.diff
+     Remove diffs no longer being applied.
+   * Add KDE's unstable download url to watch file
+   * Use dh-linktree to use to replace jquery.js files.
+   * Add dependency on libjs-jquery to provide replacement jquery.js
+   * Update lintian-overrides for move to multiarch.
+   * Update Build-Depends to use telepathy-qt5-dev
+ 
+  -- Diane Trout <diane at ghic.org>  Sat, 07 Nov 2015 11:02:45 -0800
+ 
+ ktp-text-ui (0.9.0+dfsg-1) unstable; urgency=medium
  
+   [ Diane Trout ]
    * New upstream release.
    * Update libtelepathy-qt build-dep to 0.9.5
-   * Update libktpcommoninternalsprivate-dev build-dep to 0.8.80
+   * Update libktpcommoninternalsprivate-dev build-dep to 0.9.0
    * Update libtelepathy-logger-qt build-dep to 0.8.0
-   * Change kde-telepathy-data dependency to source:Upstream-Version
+   * Add libkpeople-dev 0.3 build-dep
    * Change to using .install file and default dh_auto_install behavior
-     - this maeks dh_install --list-missing more reliable.
+     - this makes dh_install --list-missing more reliable.
    * Update version number in lintian-override
    * Update copyright file
    * Prevent another license file from being installed into usr/lib
    * Use libjs-jquery (>= 1.7) and libjs-scriptaculous (>= 1.8.2)
      instead of minimized copies provided by upstream.
+   * Update copyright file
+   * Update Standards-Version to 3.9.6. No changes needed.
+   * Build dfsg version to remove minimized js source files:
+     jquery.min.js and scriptaculous183.js
+ 
+  -- Diane Trout <diane at ghic.org>  Wed, 20 May 2015 22:26:23 -0700
+ 
++ktp-text-ui (0.9.0-0ubuntu1) vivid; urgency=medium
 +
-  -- Diane Trout <diane at ghic.org>  Sun, 21 Sep 2014 11:01:08 -0700
++  * New upstream release
++  * Merge with Debian git, no changes
++  * Update 02_ktpchat_soversion.diff to match upstream Git
++
++ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Oct 2014 13:14:03 +0100
 +
  ktp-text-ui (0.8.1-1) unstable; urgency=low
  
    * New upstream release
@@@ -84,47 -74,15 +132,47 @@@
  
   -- Diane Trout <diane at ghic.org>  Fri, 16 May 2014 21:06:46 -0700
  
- ktp-text-ui (0.7.0-1) unstable; urgency=low
- 
-   * New upstream release.
-   * Add libqjson-dev Build-Depends.
-   * Add 04_no_require_x11.patch from upstream
-   * Bump ktp-common-internals and kde-telepath-data dependencies to 0.7.0
- 
-  -- Diane Trout <diane at ghic.org>  Wed, 27 Nov 2013 18:16:56 -0800
- 
 +ktp-text-ui (0.8.1-0ubuntu1) utopic; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 28 Apr 2014 17:25:59 +0200
 +
 +ktp-text-ui (0.8.0.1-0ubuntu1) trusty; urgency=medium
 +
 +  * New upstream release (LP: #1297351)
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 01 Apr 2014 15:30:58 +0200
 +
 +ktp-text-ui (0.7.80-0ubuntu1) trusty; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 18 Feb 2014 00:15:31 +0100
 +
 +ktp-text-ui (0.7.1-0ubuntu1) trusty; urgency=medium
 +
 +  * New upstream release
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 29 Jan 2014 19:47:25 +0100
 +
+ ktp-text-ui (0.7.0-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * Add libqjson-dev Build-Depends.
+   * Add 04_no_require_x11.patch from upstream
+   * Bump ktp-common-internals and kde-telepath-data dependencies to 0.7.0
+ 
+  -- Diane Trout <diane at ghic.org>  Wed, 27 Nov 2013 18:16:56 -0800
+ 
 +ktp-text-ui (0.7.0-0ubuntu1) trusty; urgency=low
 +
 +  * New upstream release
 +  * Add libqjson-dev to Build-Depends
 +  * Add 04_no_require_x11.patch from upstream
 +
 + -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 29 Oct 2013 12:47:49 +0100
 +
  ktp-text-ui (0.6.3-1) unstable; urgency=low
  
    [ Ritesh Raj Sarraf ]
diff --cc debian/watch
index 6de058e,eb37cbb..1f884b8
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,3 +1,3 @@@
  version=3
- http://download.kde.org/stable/applications/([\d.]+)/src/ktp-text-ui-([\d.]+).tar.xz
 -
+ http://download.kde.org/stable/applications/([\d.]+)/src/ktp-text-ui-([\d.]+)\.tar\.xz
 +http://download.kde.org/unstable/applications/([\d.]+)/src/ktp-text-ui-([\d.]+).tar.xz

-- 
ktp-text-ui packaging



More information about the pkg-kde-commits mailing list