[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.14.2-1-35-ge44de4d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=21cb5ae

The following commit has been merged in the master branch:
commit 21cb5aeac638b4258fc768276b7fc8afa834805a
Merge: 114b2a4a2385ed4cecbd6e6658ccce253ea770c7 45a4cddf0e8a1deee65e64b4db779735c1c6b9e5
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 23 22:22:20 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/patches/series
    	debian/watch

 debian/.gitattributes                              |    1 -
 debian/30-baloo-inotify-limit.conf                 |    1 +
 debian/changelog                                   | 2843 +++++++++++++++++++-
 debian/control                                     |   47 +-
 debian/kde-runtime-data.install                    |    4 +-
 debian/kde-runtime.install                         |    3 +-
 debian/kde-runtime.postinst                        |   23 +
 debian/kde-runtime.preinst                         |   16 +
 debian/kde-runtime.prerm                           |   22 +
 debian/khelpcenter4.dirs                           |    1 -
 debian/khelpcenter4.install                        |    9 -
 debian/khelpcenter4.links                          |    1 -
 debian/khelpcenter4.lintian-overrides              |    1 -
 debian/not-installed                               |  136 +-
 debian/patches/kubuntu_disable-gpg-backend.diff    |   76 +
 .../kubuntu_drkonqi_whoopsie_integration.patch     |   64 +
 debian/patches/kubuntu_langpack_install.diff       |  601 +++++
 debian/patches/kubuntu_nodisplay_knetattach.diff   |    9 +
 debian/patches/kubuntu_shutup_shutup_shutup.diff   |   20 +
 debian/patches/series                              |    8 +-
 .../patches/use_always_present_path_to_test.patch  |   23 +
 debian/source/local-options                        |    1 -
 22 files changed, 3666 insertions(+), 244 deletions(-)

diff --cc debian/changelog
index 60d687c,d5d6451..cc502f7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,73 +1,79 @@@
 +kde-runtime (4:14.12.2-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 23 Feb 2015 22:19:24 +0100
 +
+ kde-runtime (4:14.12.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 09:36:06 -0800
+ 
+ kde-runtime (4:14.12.0-0ubuntu3) vivid; urgency=medium
+ 
+   * Remove depends on qapt-runtime
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 27 Jan 2015 11:05:59 +0100
+ 
+ kde-runtime (4:14.12.0-0ubuntu2) vivid; urgency=medium
+ 
+   * Don't apply kubuntu_langpack_install.diff, libkubuntu is moving to
+     kf5
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 20 Jan 2015 17:38:58 +0100
+ 
+ kde-runtime (4:14.12.0-0ubuntu1) vivid; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream release
+   * Remove kdelibs5-dev depend version as there was not a new release.
+   * Remove kdepimlibs5-dev depend version as there was not a new release.
+ 
+   [ Jonathan Riddell ]
+   * Do not make khelpcenter4, we have khelpcenter from plasma 5
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 12 Dec 2014 04:24:33 -0800
+ 
+ kde-runtime (4:14.11.97-0ubuntu1) vivid; urgency=medium
+ 
+   [ Philip Muškovac ]
+   * Merge with debian git, remaining changes:
+     - add and install 30-baloo-inotify-limit.conf
+     - build-depend on libboost1.55-dev instead of libboost-dev
+     - build-depend on libkubuntu-dev
+     - kde-runtime:
+       + depends on language-selector-common and libqapt2-runtime
+       + recommends, not suggests icoutils, libcanberra-pulse,
+         sound-theme-freedesktop
+       + recommends udisks2, upower
+       + breaks/replaces kde-runtime-data (<< 4:4.13.97)
+     - kde-runtime-data breaks/replaces kde-runtime (<< 4:4.13.90)
+     - khelpcenter4 breaks/replaces kde-runtime-data (<< 4:4.13.90)
+     - put kdesu into /usr/lib/kde4/libexec/kdesu-distrib/
+     - add kde-runtime.(postins|preinst|prerm) for kdesu handling
+     - keep our changes to not-installed
+     - add patches:
+       + kubuntu_disable-gpg-backend.diff
+       + kubuntu_drkonqi_whoopsie_integration.patch
+       + kubuntu_langpack_install.diff
+       + kubuntu_nodisplay_knetattach.diff
+       + kubuntu_shutup_shutup_shutup.diff
+       + upstream_CVE-2014-8600.diff
+       + use_always_present_path_to_test.patch
+   * New upstream release candidate
+     - drop upstream_CVE-2014-8600.diff, applied upstream
+     - refresh kde-runtime-data.install
+   * Fix watch urls for new release location
+   * Update Vcs urls for the new repository location
+   * Update the maintainer
+ 
+   [ Jonathan Riddell ]
+   * Make depends on kdelibs5-plugins unversioned
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 23 Nov 2014 18:30:53 +0100
+ 
 -kde-runtime (4:4.14.2-2) UNRELEASED; urgency=medium
 +kde-runtime (4:4.14.2-2) unstable; urgency=medium
  
    [ Lisandro Damián Nicanor Pérez Meyer ]
    * Remove myself from Uploaders.
diff --cc debian/patches/series
index c133a57,a0c29ba..4357504
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,6 -2,11 +2,12 @@@
  disable_usr_lib_install_rpath.diff
  khelp_htdig.diff
  use_the_correct_locale.patch
+ use_always_present_path_to_test.patch
  disable_flacky_tests
  disable_kwalletd_autotests
 +upstream_sanitize_path
+ #kubuntu_langpack_install.diff
+ kubuntu_nodisplay_knetattach.diff
+ kubuntu_shutup_shutup_shutup.diff
+ kubuntu_drkonqi_whoopsie_integration.patch
+ kubuntu_disable-gpg-backend.diff

-- 
KDE Base Runtime module packaging