diff -u kde4libs-4.1.2/debian/changelog kde4libs-4.1.2/debian/changelog --- kde4libs-4.1.2/debian/changelog +++ kde4libs-4.1.2/debian/changelog @@ -1,3 +1,10 @@ +kde4libs (4:4.1.2-0ubuntu11) intrepid; urgency=low + + * update kubuntu_06_user_disk_mounting.diff to hide the long dbus-send + commands used to mount disks (LP: #290589) + + -- Terence Simpson Fri, 31 Oct 2008 20:52:20 +0000 + kde4libs (4:4.1.2-0ubuntu10) intrepid; urgency=low * Remove 12_deprecate_applnk.diff, it was the cause of all the problems with diff -u kde4libs-4.1.2/debian/patches/kubuntu_06_user_disk_mounting.diff kde4libs-4.1.2/debian/patches/kubuntu_06_user_disk_mounting.diff --- kde4libs-4.1.2/debian/patches/kubuntu_06_user_disk_mounting.diff +++ kde4libs-4.1.2/debian/patches/kubuntu_06_user_disk_mounting.diff @@ -1,8 +1,8 @@ -Index: kdelibs-4.1.2/solid/solid/backends/hal/halstorageaccess.cpp +Index: kde4libs-4.1.2/solid/solid/backends/hal/halstorageaccess.cpp =================================================================== ---- kdelibs-4.1.2.orig/solid/solid/backends/hal/halstorageaccess.cpp 2008-09-25 13:57:44.000000000 +0200 -+++ kdelibs-4.1.2/solid/solid/backends/hal/halstorageaccess.cpp 2008-09-25 20:34:45.000000000 +0200 -@@ -21,6 +21,7 @@ +--- kde4libs-4.1.2.orig/solid/solid/backends/hal/halstorageaccess.cpp 2008-11-03 17:41:36.000000000 +0000 ++++ kde4libs-4.1.2/solid/solid/backends/hal/halstorageaccess.cpp 2008-11-04 18:32:41.000000000 +0000 +@@ -21,14 +21,17 @@ #include #include @@ -10,7 +10,9 @@ #include #include #include -@@ -29,6 +30,7 @@ + #include + #include ++#include #include #include @@ -18,7 +20,7 @@ #include "halfstabhandling.h" -@@ -133,11 +135,21 @@ +@@ -133,11 +136,21 @@ { // TODO: Better error reporting here if (m_setupInProgress) { @@ -40,7 +42,7 @@ m_teardownInProgress = false; emit teardownDone(Solid::UnauthorizedOperation, error.name()+": "+error.message(), -@@ -232,9 +244,16 @@ +@@ -232,9 +245,16 @@ QStringList options; QStringList halOptions = m_device->property("volume.mount.valid_options").toStringList(); @@ -58,7 +60,7 @@ //respect Microsoft Windows-enforced charsets for fat if ( m_device->property("volume.fstype").toString()=="vfat" ) { bool linuxMount=halOptions.contains("codepage="); -@@ -342,6 +361,76 @@ +@@ -342,6 +362,85 @@ SLOT(slotDBusError(const QDBusError &))); } @@ -73,14 +75,21 @@ +} + +QProcess* callPrivilegedCommand(const QString& command, -+ QObject* obj, const char* slot) ++ QObject* obj, const char* slot, ++ const QString& comment) +{ + QProcess* process = new QProcess(obj); + + QObject::connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), + obj, slot); + -+ process->start(sudoCommandName(), QStringList() << "-d" << "--noignorebutton" << "-c" << command); ++ QStringList commandArgs; ++ commandArgs << "-d" << "--noignorebutton"; ++ if(!comment.isEmpty()) ++ commandArgs << "--comment" << comment; ++ commandArgs << "-c" << command; ++ ++ process->start(sudoCommandName(), commandArgs); + + if (process->waitForStarted()) { + return process; @@ -113,7 +122,8 @@ + + m_process = callPrivilegedCommand(command, + this, -+ SLOT(slotProcessFinished(int, QProcess::ExitStatus))); ++ SLOT(slotProcessFinished(int, QProcess::ExitStatus)), ++ i18n("Please enter your password to use this device")); + + return (m_process != 0); +} @@ -127,7 +137,8 @@ + + m_process = callPrivilegedCommand(command, + this, -+ SLOT(slotProcessFinished(int, QProcess::ExitStatus))); ++ SLOT(slotProcessFinished(int, QProcess::ExitStatus)), ++ i18n("Please enter your password to safely remove this device")); + + return m_process != 0; +} @@ -135,10 +146,10 @@ bool Solid::Backends::Hal::StorageAccess::callSystemMount() { const QString device = m_device->property("block.device").toString(); -Index: kdelibs-4.1.2/solid/solid/backends/hal/halstorageaccess.h +Index: kde4libs-4.1.2/solid/solid/backends/hal/halstorageaccess.h =================================================================== ---- kdelibs-4.1.2.orig/solid/solid/backends/hal/halstorageaccess.h 2008-05-21 13:07:38.000000000 +0200 -+++ kdelibs-4.1.2/solid/solid/backends/hal/halstorageaccess.h 2008-09-25 20:33:50.000000000 +0200 +--- kde4libs-4.1.2.orig/solid/solid/backends/hal/halstorageaccess.h 2008-11-03 17:41:36.000000000 +0000 ++++ kde4libs-4.1.2/solid/solid/backends/hal/halstorageaccess.h 2008-11-04 18:31:32.000000000 +0000 @@ -66,6 +66,9 @@ bool callHalVolumeMount(); bool callHalVolumeUnmount(); @@ -151,0 +163,34 @@ +Index: kde4libs-4.1.2/solid/solid/backends/hal/Messages.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ kde4libs-4.1.2/solid/solid/backends/hal/Messages.sh 2008-11-04 18:31:32.000000000 +0000 +@@ -0,0 +1,2 @@ ++#! /usr/bin/env bash ++$XGETTEXT `find . -name "*.cpp" -o -name "*.cc" -o -name "*.h" | grep -v "/tests"` -o $podir/solid4.pot +Index: kde4libs-4.1.2/solid/solid/CMakeLists.txt +=================================================================== +--- kde4libs-4.1.2.orig/solid/solid/CMakeLists.txt 2008-11-03 17:41:36.000000000 +0000 ++++ kde4libs-4.1.2/solid/solid/CMakeLists.txt 2008-11-04 18:31:32.000000000 +0000 +@@ -1,7 +1,7 @@ + set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) + add_subdirectory( ifaces ) + add_subdirectory( backends ) +-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) ++include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/kdecore ) + + if(WIN32) + include_directories( ${KDEWIN32_INCLUDES} ) +@@ -178,9 +178,12 @@ + set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${KDEWIN32_LIBRARY}) + endif(WIN32) + ++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") ++ + kde4_add_library(solid SHARED ${solid_LIB_SRCS}) + +-target_link_libraries(solid ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${solid_OPTIONAL_LIBS}) ++target_link_libraries(solid ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${solid_OPTIONAL_LIBS} ${PROJECT_BINARY_DIR}/lib/libkdecore.so) + + set_target_properties(solid PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) + install(TARGETS solid ${INSTALL_TARGETS_DEFAULT_ARGS})