[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-1-53-gc616ff8

Modestas Vainius modax at alioth.debian.org
Fri Nov 26 20:19:21 UTC 2010


The following commit has been merged in the master branch:
commit c616ff8d4ad5775a636b41aa86eec5f9b18b60b4
Merge: 889caf391004248de682fff29ae7b34b63055406 e05818212a99d924f0726e51502f5038afbe58ac
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Nov 26 22:17:44 2010 +0200

    Merge remote branch 'origin/kde4.6'
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |    5 +-
 debian/patches/08_add_debian_build_type.diff       |    8 +-
 .../patches/09_disable_usr_lib_install_rpath.diff  |    8 +-
 debian/patches/10_make_libkdeinit4_private.diff    |  102 ++++++++++++--------
 .../patches/11_default_kde4_xdg_menu_prefix.diff   |   18 ++--
 debian/patches/13_qt4_designer_plugins_path.diff   |   12 ++-
 debian/patches/14_hardcode_ptm_device.diff         |    6 +-
 debian/patches/15_kfreebsd_support.diff            |   38 +++++---
 debian/patches/16_debian_menu.diff                 |    6 +-
 ..._findservicebydesktoppath_try_realfilepath.diff |   18 ++--
 .../patches/19_findqt4_optional_x11_pthread.diff   |    6 +-
 debian/patches/20_use_dejavu_as_default_font.diff  |   10 +-
 .../22_hack_in_etc_kde4_in_kstandarddirs.diff      |    8 +-
 debian/patches/23_solid_no_double_build.diff       |    8 +-
 debian/patches/25_ld_exclude_libs_qtuitools.diff   |   16 ++-
 debian/patches/27_konsole_kfreebsd_fix.diff        |    8 +-
 .../28_find_old_kde4_html_documentation.diff       |    8 +-
 debian/patches/29_hurd_support.diff                |   14 ++-
 .../patches/30_kfileshare_kdesu_fileshareset.diff  |    8 +-
 .../patches/31_relax_plugin_kde_version_check.diff |   18 ++--
 20 files changed, 202 insertions(+), 123 deletions(-)

diff --cc debian/changelog
index f906123,b2923f3..e9b2dc2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -36,20 -39,11 +36,23 @@@ kde4libs (4:4.5.80-0r1) UNRELEASED; urg
      as it is required for building all of kde's documentation.
    * Bump kdebase-runtime Breaks/Recommends to version 4.5.
  
+   [ Didier Raboud ]
+   * Refresh patches for 4.5.80.
+ 
 +  [ Pino Toscano ]
 +  * Make libknewstuff2-4 and libknewstuff3-4 recommend gnupg, as they can use
 +    `gpg' for checking validity and signatures of downloaded content.
 +
   -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 14 Nov 2010 13:19:41 +0200
  
 +kde4libs (4:4.4.5-2) unstable; urgency=low
 +
 +  * Point debian/control Vcs fields to the new Git repository.
 +  * kdelibs5-data should break/replace kdelibs-data 4:3.5.10.dfsg.1-4 as well.
 +    That version still has the same files as kdelibs5-data.
 +
 + -- Modestas Vainius <modax at debian.org>  Fri, 26 Nov 2010 21:46:06 +0200
 +
  kde4libs (4:4.4.5-1) unstable; urgency=low
  
    [ Modestas Vainius ]

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list