[SCM] kio packaging branch, kubuntu_wily_archive, updated. debian/5.8.0-1-17-g8fc1eda

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Tue May 19 11:53:06 UTC 2015


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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 8fc1edaf448bf56edc0c9f8b84a4f566681ef4ed
Merge: 587b2d71aa4e511002559797636a1808629ca76c 386fbe39ffeb15a5588705a98046362d0a28700f
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue May 19 13:53:03 2015 +0200

    merge master

 debian/.gitattributes                     |   1 +
 debian/changelog                          |  30 +
 debian/control                            |  77 ++-
 debian/copyright                          | 894 +++++++++++++++++-------------
 debian/kio-dev.acc.in                     |  28 +
 debian/kio-dev.install                    |  19 +-
 debian/kio.install                        |  33 +-
 debian/kio.manpages                       |   1 -
 debian/libkf5kiocore5.symbols             |   5 +-
 debian/libkf5kiofilewidgets5.symbols      |   2 +-
 debian/patches/report_error_removing_dirs |  51 ++
 debian/patches/return_on_ACCESS_DENIED    |  14 +
 debian/patches/series                     |   3 +
 debian/patches/wait_for_a_bit_longer      |  13 +
 debian/rules                              |   4 +-
 debian/tests/acc                          |  11 +
 debian/tests/control                      |   6 +-
 debian/tests/testsuite                    |   5 +
 debian/tests/testsuite.xsession           |  12 +-
 debian/watch                              |   4 +-
 20 files changed, 773 insertions(+), 440 deletions(-)

diff --cc debian/changelog
index 2b6d018,a6fab32..77b8c40
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,20 +1,47 @@@
 +kio (5.9.0-0ubuntu1.1) vivid; urgency=medium
 +
 +  * Add upstream patch
 +    upstream_Remove-bookmarks-syncing-from-KFilePlacesModel-and-u.patch
 +    to remove faulty bookmarks syncing from places and use a single config for
 +    places instead. LP: #1422469
 +
 + -- Harald Sitter <sitter at kde.org>  Mon, 04 May 2015 10:56:34 +0200
 +
 +kio (5.9.0-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:28:24 +0200
 +
 +kio (5.8.0-0ubuntu2) vivid; urgency=medium
 +
 +  * Add kubuntu_kdelibs4-docs-path.diff to search in kdelibs4 path
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Apr 2015 17:19:09 +0200
 +
 +kio (5.8.0-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:38:15 +0100
 +
+ kio (5.8.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.8.0).
+   * Update symbols files.
+   * New patch: wait_for_a_bit_longer
+   * Update copyright information.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:41 +0100
+ 
+ kio (5.7.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.7.0).
+   * New patch: return_on_ACCESS_DENIED
+   * New patch: report_error_removing_dirs
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:43 +0100
+ 
  kio (5.7.0-0ubuntu2) vivid; urgency=medium
  
    * Make sure autopkgtest pulls in own binary packages as Depends
diff --cc debian/patches/series
index 4729980,582dfbc..1d5f405
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,3 +1,4 @@@
 +kubuntu_kdelibs4-docs-path.diff
+ return_on_ACCESS_DENIED
+ report_error_removing_dirs
+ wait_for_a_bit_longer

-- 
kio packaging



More information about the pkg-kde-commits mailing list