Merge lp:~yofel/kdelibs/4.5.85ubuntu1 into lp:~kubuntu-packagers/kubuntu-packaging/kdelibs

[Philip Muškovac]

4.5.85 release

[Jonathan Thomas (echidnaman)]

Merged, thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-03 19:20:16 +0000
+++ debian/changelog	2010-12-04 00:57:59 +0000
@@ -1,3 +1,13 @@
+kde4libs (4:4.5.85-0ubuntu1) natty; urgency=low
+
+  * New upstream beta release
+    - drop kubuntu_78_solid_trunk.diff and kubuntu_80_find_hupnp.diff, 
+      applied upstream
+    - disable 23_solid_no_double_build.diff, causes FTBFS
+    - refresh kdelibs5-dev.install
+
+ -- Philip Muskovac <[e-mail]>  Sat, 04 Dec 2010 00:05:09 +0100
+
 kde4libs (4:4.5.80a-0ubuntu6) natty; urgency=low
 
   * Fix the versioned break on libkwebkit-dev

=== modified file 'debian/kdelibs5-dev.install'
--- debian/kdelibs5-dev.install	2010-11-24 14:03:11 +0000
+++ debian/kdelibs5-dev.install	2010-12-04 00:57:59 +0000
@@ -1627,6 +1627,8 @@
 usr/include/nepomuk/nepomukontologyloader.h
 usr/include/nepomuk/nepomukquery_export.h
 usr/include/nepomuk/nepomukservice.h
+usr/include/nepomuk/nexif.h
+usr/include/nepomuk/nmo.h
 usr/include/nepomuk/ontology.h
 usr/include/nepomuk/ontologyloader.h
 usr/include/nepomuk/ontologymanager.h
@@ -2040,6 +2042,7 @@
 usr/include/nepomuk/pimo.h
 usr/include/plasma/pluginloader.h
 usr/include/plasma/widgets/declarativewidget.h
+usr/include/KDE/KCurrencyCode
 usr/include/KDE/KDualAction
 usr/include/KDE/KEditListWidget
 usr/include/KDE/KSelectionProxyModel

=== removed file 'debian/patches/kubuntu_78_solid_trunk.diff'
--- debian/patches/kubuntu_78_solid_trunk.diff	2010-11-23 13:05:40 +0000
+++ debian/patches/kubuntu_78_solid_trunk.diff	1970-01-01 00:00:00 +0000
@@ -1,218 +0,0 @@
-diff -urN kdelibs-4.5.80/solid/solid//CMakeLists.txt svn/kdelibs/solid/solid//CMakeLists.txt
---- kdelibs-4.5.80/solid/solid//CMakeLists.txt	2010-11-22 15:52:12.172926002 +0000
-+++ svn/kdelibs/solid/solid//CMakeLists.txt	2010-11-22 17:49:05.868926002 +0000
-@@ -1,6 +1,6 @@
- set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- add_subdirectory( ifaces )
--include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/kdecore )
-+include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
- 
- if(WIN32)
-    include_directories( ${KDEWIN_INCLUDES} )
-@@ -267,9 +267,6 @@
-    )
- endif(APPLE)
- 
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${PROJECT_SOURCE_DIR}/kdecore")
--set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -L${PROJECT_BINARY_DIR}/lib")
--
- if(WIN32)
-    include(CheckIncludeFileCXX)
-    check_include_file_cxx(wbemidl.h HAVE_WBEM)
-@@ -365,14 +362,7 @@
- install(FILES org.freedesktop.PowerManagement.Inhibit.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
- 
- ########### static lib for tests  ###############
--macro(AUTOMOC_COPY _from_target _to_target)
--    set(_srcfile ${CMAKE_CURRENT_BINARY_DIR}/${_from_target}_automoc.cpp)
--    set(_dstfile ${CMAKE_CURRENT_BINARY_DIR}/${_to_target}_automoc.cpp)
--    add_custom_command(OUTPUT ${_dstfile} COMMAND ${CMAKE_COMMAND} -E copy
--        ${_srcfile} ${_dstfile} MAIN_DEPENDENCY ${_srcfile})
--endmacro(AUTOMOC_COPY _from_target _to_target)
- 
--automoc_copy(solid solid_static)
- kde4_add_library(solid_static STATIC ${solid_LIB_SRCS})
- 
- target_link_libraries(solid_static ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${solid_OPTIONAL_LIBS})
-diff -urN kdelibs-4.5.80/solid/solid//backends/hal/halstorageaccess.cpp svn/kdelibs/solid/solid//backends/hal/halstorageaccess.cpp
---- kdelibs-4.5.80/solid/solid//backends/hal/halstorageaccess.cpp	2010-11-22 14:46:56.068926001 +0000
-+++ svn/kdelibs/solid/solid//backends/hal/halstorageaccess.cpp	2010-11-22 17:49:04.804926002 +0000
-@@ -25,7 +25,6 @@
- 
- #include <QtCore/QLocale>
- #include <QtCore/QDebug>
--#include <QtCore/QTextStream>
- #include <QtCore/QProcess>
- #include <QtCore/QTimer>
- #include <QtDBus/QDBusConnection>
-@@ -34,11 +33,9 @@
- #include <QtDBus/QDBusVariant>
- #include <QtGui/QApplication>
- #include <QtGui/QWidget>
--#include <localization/klocalizedstring.h>
- 
- #include <unistd.h>
- #include <stdlib.h>
--#include <locale.h>
- 
- #ifdef Q_OS_FREEBSD
- #include <langinfo.h>
-@@ -250,19 +247,10 @@
- {
-     // TODO: Better error reporting here
-     if (m_setupInProgress) {
--       if (error.name() == "org.freedesktop.Hal.Device.Volume.PermissionDenied") {
--          callHalPrivilegedVolumeMount();
--          return;
--        }
-         m_setupInProgress = false;
-         m_device->broadcastActionDone("setup", Solid::UnauthorizedOperation,
-                                       QString(error.name()+": "+error.message()));
-     } else if (m_teardownInProgress) {
--        if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
--            callHalPrivilegedVolumeUnmount();
--            return;
--        }
--
-         m_teardownInProgress = false;
-         m_device->broadcastActionDone("teardown", Solid::UnauthorizedOperation,
-                                       QString(error.name()+": "+error.message()));
-@@ -405,17 +393,10 @@
- #else
-     QString uid="uid=";
- #endif
--    QString fsType = m_device->property("volume.fstype").toString();
--
--    if (halOptions.contains("uid=") && !fsType.contains("ntfs")) {
-+    if (halOptions.contains(uid)) {
-         options << uid+QString::number(::getuid());
-     }
- 
--    if (fsType.contains("ntfs")) {
--        options << "locale=" + QString(setlocale(LC_ALL, ""));
--    }
--
--
- #ifdef Q_OS_FREEBSD
-     char *cType;
-     if ( fstype=="vfat" && halOptions.contains("-L=")) {
-@@ -495,86 +476,6 @@
-     return m_process!=0;
- }
- 
--QString sudoCommandName()
--{
--    return "/usr/lib/kde4/libexec/kdesu";
--}
--
--QString dbusSendCommandName()
--{
--    return "dbus-send";
--}
--
--QProcess* callPrivilegedCommand(const QString& command,
--                                QObject* obj, const char* slot,
--                                const QString& comment)
--{
--    QProcess* process = new QProcess(obj);
--
--    QObject::connect(process, SIGNAL(finished(int, QProcess::ExitStatus)),
--                     obj, slot);
--
--    QStringList commandArgs;
--    commandArgs << "-d" << "--noignorebutton";
--    if(!comment.isEmpty())
--        commandArgs << "--comment" << comment;
--    commandArgs << "-c" << command;
--
--    process->start(sudoCommandName(), commandArgs);
--
--    if (process->waitForStarted()) {
--        return process;
--    } else {
--        delete process;
--        return 0;
--    }
--}
--
--bool Solid::Backends::Hal::StorageAccess::callHalPrivilegedVolumeMount()
--{
--    QStringList options;
--    QStringList halOptions = m_device->property("volume.mount.valid_options").toStringList();
--
--    QString fsType = m_device->property("volume.fstype").toString();
--
--    if (halOptions.contains("uid=") && !fsType.contains("ntfs")) {
--        options << "uid="+QString::number(::getuid());
--    }
--
--    if (fsType.contains("ntfs")) {
--        options << "locale=" + QString(setlocale(LC_ALL, ""));
--    }
--
--    QString command;
--    QTextStream(&command) << dbusSendCommandName()
--            << " --system --print-reply --dest=org.freedesktop.Hal " << m_device->udi()
--            << " org.freedesktop.Hal.Device.Volume.Mount string:" << filePath()
--            << " string: array:string:" << options.join(",");
--
--    m_process = callPrivilegedCommand(command,
--                                      this,
--                                      SLOT(slotProcessFinished(int, QProcess::ExitStatus)),
--                                      QObject::tr("Please enter your password to use this device"));
--
--    return (m_process != 0);
--}
--
--bool Solid::Backends::Hal::StorageAccess::callHalPrivilegedVolumeUnmount()
--{
--    QString command;
--    QTextStream(&command) << dbusSendCommandName()
--            << " --system --print-reply --dest=org.freedesktop.Hal " << m_device->udi()
--            << " org.freedesktop.Hal.Device.Volume.Unmount array:string:force";
--
--    m_process = callPrivilegedCommand(command,
--                                      this,
--                                      SLOT(slotProcessFinished(int, QProcess::ExitStatus)),
--                                      QObject::tr("Please enter your password to safely remove this device"));
--
--    return m_process != 0;
--}
--
--
- bool Solid::Backends::Hal::StorageAccess::callSystemUnmount()
- {
-     const QString device = m_device->property("block.device").toString();
-diff -urN kdelibs-4.5.80/solid/solid//backends/hal/halstorageaccess.h svn/kdelibs/solid/solid//backends/hal/halstorageaccess.h
---- kdelibs-4.5.80/solid/solid//backends/hal/halstorageaccess.h	2010-11-22 14:46:56.068926001 +0000
-+++ svn/kdelibs/solid/solid//backends/hal/halstorageaccess.h	2010-11-22 17:49:04.808926002 +0000
-@@ -79,9 +79,6 @@
-     bool callHalVolumeUnmount();
-     bool callHalVolumeEject();
- 
--    bool callHalPrivilegedVolumeMount();
--    bool callHalPrivilegedVolumeUnmount();
--
-     bool callSystemMount();
-     bool callSystemUnmount();
- 
-diff -urN kdelibs-4.5.80/solid/solid//backends/upower/upowermanager.cpp svn/kdelibs/solid/solid//backends/upower/upowermanager.cpp
---- kdelibs-4.5.80/solid/solid//backends/upower/upowermanager.cpp	2010-10-05 11:39:51.000000000 +0000
-+++ svn/kdelibs/solid/solid//backends/upower/upowermanager.cpp	2010-11-22 17:49:02.844926002 +0000
-@@ -46,12 +46,10 @@
- 
-     qDBusRegisterMetaType<QList<QDBusObjectPath> >();
- 
--    if (m_manager.isValid()) {
--        connect(&m_manager, SIGNAL(DeviceAdded(QString)),
--                this, SLOT(slotDeviceAdded(QString)));
--        connect(&m_manager, SIGNAL(DeviceRemoved(QString)),
--                this, SLOT(slotDeviceRemoved(QString)));
--    }
-+    connect(&m_manager, SIGNAL(DeviceAdded(QString)),
-+            this, SLOT(slotDeviceAdded(QString)));
-+    connect(&m_manager, SIGNAL(DeviceRemoved(QString)),
-+            this, SLOT(slotDeviceRemoved(QString)));
- }
- 
- UPowerManager::~UPowerManager()

=== removed file 'debian/patches/kubuntu_80_find_hupnp.diff'
--- debian/patches/kubuntu_80_find_hupnp.diff	2010-11-23 13:05:40 +0000
+++ debian/patches/kubuntu_80_find_hupnp.diff	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-Description: Upstream changes introduced in version 4:4.5.80-0ubuntu1~ppa1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- kde4libs (4:4.5.80-0ubuntu1~ppa1) natty; urgency=low
- .
-   [ Scott Kitterman ]
-   * New upstream beta release
-     - Refreshed all patches
-     - Updated debian/patches/10_make_libkdeinit4_private.diff to use Qfile
-       instead of Qstring in kdecore/kernel/kstandarddirs_unix.cpp
-     - Updated debian/patches/kubuntu_01_kubuntu_useragent.diff to provide
-       Kubuntu in the Konqueror user agen string with the changes in
-       kio/kio/kprotocolmanager.cpp
-     - Partially updated debian/patches/kubuntu_05_langpack_desktop_files.diff
-       and left the balance in kdecore/localization/klocale.cpp.rej for later
-       revision
-     - Update debian/patches/kubuntu_06_user_disk_mounting.diff for changes in
-       solid/solid/backends/hal/halstorageaccess.cpp
-     - Remove debian/patches/kubuntu_71_backport_plasma_webview_changes.diff
-       (backported from upstream, so already present now)
-     - Add minimum version for libattica-dev of 0.1.90 to build-depends
-     - Bump minimum version for libsoprano-dev build-depend to 2.5.60
-     - Add minimum version for shared-desktop-ontologies of 0.5 in build-dep
- .
-   [ Jonathan Riddell ]
-   * Add build-depends on grantlee, libudev-dev, hupnp (FIXME needs packaging fixes)
-   * Update kubuntu_04_add_langpack_path.diff 28_find_old_kde4_html_documentation.diff
-     22_hack_in_etc_kde4_in_kstandarddirs.diff for QT_NO_CAST_FROM_ASCII
-   * Update kubuntu_05_langpack_desktop_files.diff for new upstream code
-   * Add kubuntu_78_solid_trunk.diff to fix solid linking
-   * Add libnepomukutils4 package for new library
-   * Don't install kcm_ssl for now, e-mailed upstream to suggest moving to kdebase
-   * Add kubuntu_79_knewstuff_fix.diff to fix compile broken by non-trunk commit
-     http://websvn.kde.org/?view=revision&revision=1199825
-   * kdelibs5-data replaces old kdebase-runtime-data due to moved file
- .
- The person named in the Author field signed this changelog entry.
-Author: Jonathan Riddell <[e-mail]>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- kde4libs-4.5.80.orig/cmake/modules/FindHUpnp.cmake
-+++ kde4libs-4.5.80/cmake/modules/FindHUpnp.cmake
-@@ -7,7 +7,10 @@
- #
- # Copyright (c) 2010, Paulo Romulo Alves Barros <[e-mail]>
- 
--find_path( HUPNP_INCLUDE_DIR HUpnp )
-+find_path( HUPNP_INCLUDE_DIR
-+     NAMES HUpnp
-+     PATH_SUFFIXES HUpnpCore
-+)
- 
- find_library( HUPNP_LIBS HUpnp )
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-29 17:14:21 +0000
+++ debian/patches/series	2010-12-04 00:57:59 +0000
@@ -9,7 +9,7 @@
 17_findservicebydesktoppath_try_realfilepath.diff
 19_findqt4_optional_x11_pthread.diff
 22_hack_in_etc_kde4_in_kstandarddirs.diff
-23_solid_no_double_build.diff
+#23_solid_no_double_build.diff
 25_ld_exclude_libs_qtuitools.diff
 27_konsole_kfreebsd_fix.diff
 28_find_old_kde4_html_documentation.diff
@@ -27,5 +27,3 @@
 kubuntu_69_declare_debugger_pid.diff
 security_01_CVE-2009-2702.diff
 kubuntu_77_no_kbookmark_write_error.diff
-kubuntu_78_solid_trunk.diff
-kubuntu_80_find_hupnp.diff