[SCM] kio packaging branch, kubuntu_unstable, updated. ubuntu/5.15.0-0ubuntu3-83-g9b40606

Clive Johnston clivejo-guest at moszumanska.debian.org
Mon Feb 15 20:51:12 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=9b40606

The following commit has been merged in the kubuntu_unstable branch:
commit 9b4060679fa70b4e53a1b4a58ed7576a374cf932
Merge: 39ef2ec3b2d6f09f0ce2e39efdaf1ff7231c5b82 14e1cab43931e0f89b656131fafed7109ff2a1a1
Author: Clive Johnston <clivejo at aol.com>
Date:   Mon Feb 15 20:50:54 2016 +0000

    Merged with Debian
    - Add upstream patch: upstream_autotest__fix_ctest.patch
    - Add upstream patch: upstream_fix_wrong_path.patch
    - Add upstream patch: upstream_kioslavetest_fix_crash.patch
    - Add new library libkf5kiogui.
    - Update symbols files.

 debian/changelog                                   |  9 +++--
 debian/control                                     | 16 +--------
 debian/kio-dev.install                             |  4 +--
 debian/patches/fix_kfreebsd_build                  | 24 +++++++++++++
 debian/patches/report_error_removing_dirs          |  8 ++---
 debian/patches/series                              |  4 +++
 debian/patches/upstream_autotest__fix_ctest.patch  | 40 ++++++++++++++++++++++
 debian/patches/upstream_fix_wrong_path.patch       | 26 ++++++++++++++
 .../patches/upstream_kioslavetest_fix_crash.patch  | 21 ++++++++++++
 debian/patches/wait_for_a_bit_longer               |  6 ++--
 debian/rules                                       |  2 +-
 11 files changed, 131 insertions(+), 29 deletions(-)

diff --cc debian/changelog
index 872f2e7,77ed0c0..55f8d4f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,13 +1,20 @@@
 -kio (5.19.0-1~1) UNRELEASED; urgency=medium
 +kio (5.18.0-1ubuntu1) UNRELEASED; urgency=medium
  
 -  * New upstream release (5.19.0).
 -  * Add upstream patch: upstream_autotest__fix_ctest.patch
 -  * Add upstream patch: upstream_fix_wrong_path.patch
 -  * Add upstream patch: upstream_kioslavetest_fix_crash.patch
 -  * Add new library libkf5kiogui.
 -  * Update symbols files.
 +  [ Scarlett Clark ]
 +  * New upstream release Xenial
 +
 +  [ Philip Muškovac ]
 +  * New upstream release
 +
 +  [ Clive Johnston ]
-   * Updating install file
-   * Updating symbols
-   * Adding new lib - libkf5kiogui5
++  * Merged with Debian
++    - Add upstream patch: upstream_autotest__fix_ctest.patch
++    - Add upstream patch: upstream_fix_wrong_path.patch
++    - Add upstream patch: upstream_kioslavetest_fix_crash.patch
++    - Add new library libkf5kiogui.
++    - Update symbols files.
  
 - -- Maximiliano Curia <maxy at debian.org>  Mon, 08 Feb 2016 16:22:00 +0100
 + -- Clive Johnston <clivejo at aol.com>  Mon, 08 Feb 2016 15:11:59 +0000
  
  kio (5.18.0-1) experimental; urgency=medium
  

-- 
kio packaging



More information about the pkg-kde-commits mailing list