Hello community,
here is the log from the commit of package kdebase3
checked in at Tue Mar 28 18:29:20 CEST 2006.
--------
--- /work/SRC/all/KDE/kdebase3/kdebase3.changes 2006-03-23 17:21:40.000000000 +0100
+++ /work/src/done/STABLE/kdebase3/kdebase3.changes 2006-03-28 17:46:51.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Mar 28 17:46:23 CEST 2006 - coolo@suse.de
+
+- update media_hal.diff to handle fstab entries more correctly
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.1fysti/_old 2006-03-28 18:27:28.000000000 +0200
+++ /var/tmp/diff_new_pack.1fysti/_new 2006-03-28 18:27:28.000000000 +0200
@@ -37,7 +37,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.1
-Release: 46
+Release: 48
%define kde_version 3.5.1
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -321,7 +321,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 59
+Release: 61
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -1383,6 +1383,8 @@
%endif
%changelog -n kdebase3
+* Tue Mar 28 2006 - coolo@suse.de
+- update media_hal.diff to handle fstab entries more correctly
* Thu Mar 23 2006 - stbinner@suse.de
- add patch to fix jumpy taskbar size (#156621)
- update media_hal.diff to fix setting of mount properties for a
++++++ media_hal.diff ++++++
--- /var/tmp/diff_new_pack.1fysti/_old 2006-03-28 18:27:32.000000000 +0200
+++ /var/tmp/diff_new_pack.1fysti/_new 2006-03-28 18:27:32.000000000 +0200
@@ -1,7 +1,7 @@
Index: medianotifier/medianotifier.cpp
===================================================================
---- medianotifier/medianotifier.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ medianotifier/medianotifier.cpp (.../work/coolos_media) (revision 521818)
+--- medianotifier/medianotifier.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ medianotifier/medianotifier.cpp (.../work/coolos_media) (Revision 523597)
@@ -54,7 +54,10 @@
{
kdDebug() << "MediaNotifier::onMediumChange( " << name << ", "
@@ -30,8 +30,8 @@
return false;
Index: libmediacommon/medium.cpp
===================================================================
---- libmediacommon/medium.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ libmediacommon/medium.cpp (.../work/coolos_media) (revision 521818)
+--- libmediacommon/medium.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ libmediacommon/medium.cpp (.../work/coolos_media) (Revision 523597)
@@ -40,6 +40,8 @@
m_properties+= QString::null; /* ICON_NAME */
@@ -52,8 +52,8 @@
const Medium Medium::create(const QStringList &properties)
Index: libmediacommon/medium.h
===================================================================
---- libmediacommon/medium.h (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ libmediacommon/medium.h (.../work/coolos_media) (revision 521818)
+--- libmediacommon/medium.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ libmediacommon/medium.h (.../work/coolos_media) (Revision 523597)
@@ -22,6 +22,7 @@
#include
#include
@@ -98,8 +98,8 @@
#endif
Index: mediaimpl.cpp
===================================================================
---- mediaimpl.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mediaimpl.cpp (.../work/coolos_media) (revision 521818)
+--- mediaimpl.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mediaimpl.cpp (.../work/coolos_media) (Revision 523597)
@@ -226,6 +226,8 @@
mp_mounting = &medium;
@@ -138,8 +138,8 @@
Index: kfile-plugin/kfile_media.desktop
===================================================================
---- kfile-plugin/kfile_media.desktop (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ kfile-plugin/kfile_media.desktop (.../work/coolos_media) (revision 521818)
+--- kfile-plugin/kfile_media.desktop (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ kfile-plugin/kfile_media.desktop (.../work/coolos_media) (Revision 523597)
@@ -57,4 +57,4 @@
Name[zh_TW]=媒體資訊
ServiceTypes=KFilePlugin
@@ -148,8 +148,8 @@
+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted
Index: kfile-plugin/kfilemediaplugin.cpp
===================================================================
---- kfile-plugin/kfilemediaplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ kfile-plugin/kfilemediaplugin.cpp (.../work/coolos_media) (revision 521818)
+--- kfile-plugin/kfilemediaplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ kfile-plugin/kfilemediaplugin.cpp (.../work/coolos_media) (Revision 523597)
@@ -64,12 +64,16 @@
addMimeType( "media/floppy_unmounted" );
addMimeType( "media/zip_unmounted" );
@@ -180,8 +180,8 @@
{
Index: configure.in.in
===================================================================
---- configure.in.in (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ configure.in.in (.../work/coolos_media) (revision 521818)
+--- configure.in.in (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ configure.in.in (.../work/coolos_media) (Revision 523597)
@@ -90,6 +90,13 @@
if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then
KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) )
@@ -198,8 +198,8 @@
dbus=FOUND
Index: mounthelper/kio_media_mounthelper.cpp
===================================================================
---- mounthelper/kio_media_mounthelper.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mounthelper/kio_media_mounthelper.cpp (.../work/coolos_media) (revision 521818)
+--- mounthelper/kio_media_mounthelper.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mounthelper/kio_media_mounthelper.cpp (.../work/coolos_media) (Revision 523597)
@@ -27,6 +27,7 @@
#include
#include
@@ -294,8 +294,8 @@
#include "kio_media_mounthelper.moc"
Index: mounthelper/Makefile.am
===================================================================
---- mounthelper/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mounthelper/Makefile.am (.../work/coolos_media) (revision 521818)
+--- mounthelper/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mounthelper/Makefile.am (.../work/coolos_media) (Revision 523597)
@@ -6,7 +6,7 @@
kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp
@@ -307,8 +307,8 @@
Index: kcmodule/managermodule.cpp
===================================================================
---- kcmodule/managermodule.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ kcmodule/managermodule.cpp (.../work/coolos_media) (revision 521818)
+--- kcmodule/managermodule.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ kcmodule/managermodule.cpp (.../work/coolos_media) (Revision 523597)
@@ -39,15 +39,15 @@
QString hal_text = view->kcfg_HalBackendEnabled->text();
hal_text += " ("+i18n("No support for HAL on this system")+")";
@@ -329,8 +329,8 @@
}
Index: Makefile.am
===================================================================
---- Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ Makefile.am (.../work/coolos_media) (revision 521818)
+--- Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ Makefile.am (.../work/coolos_media) (Revision 523597)
@@ -1,5 +1,5 @@
SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \
- kfile-plugin kcmodule mimetypes services
@@ -347,8 +347,8 @@
+ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot
Index: propsdlgplugin/propertiespage.h
===================================================================
---- propsdlgplugin/propertiespage.h (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/propertiespage.h (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/propertiespage.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/propertiespage.h (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,46 @@
+/*
+ Copyright (c) 2004 Jan Schaefer
@@ -398,8 +398,8 @@
+#endif
Index: propsdlgplugin/media_propsdlgplugin.desktop
===================================================================
---- propsdlgplugin/media_propsdlgplugin.desktop (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/media_propsdlgplugin.desktop (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/media_propsdlgplugin.desktop (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/media_propsdlgplugin.desktop (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
@@ -410,8 +410,8 @@
+ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted
Index: propsdlgplugin/propertiespagegui.ui.h
===================================================================
---- propsdlgplugin/propertiespagegui.ui.h (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/propertiespagegui.ui.h (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/propertiespagegui.ui.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/propertiespagegui.ui.h (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,22 @@
+/****************************************************************************
+** ui.h extension file, included from the uic-generated form implementation.
@@ -437,8 +437,8 @@
+
Index: propsdlgplugin/propsdlgshareplugin.h
===================================================================
---- propsdlgplugin/propsdlgshareplugin.h (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/propsdlgshareplugin.h (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/propsdlgshareplugin.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/propsdlgshareplugin.h (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,44 @@
+/*
+ Copyright (c) 2004 Jan Schaefer
@@ -486,8 +486,8 @@
+
Index: propsdlgplugin/Makefile.am
===================================================================
---- propsdlgplugin/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/Makefile.am (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/Makefile.am (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,12 @@
+METASOURCES = AUTO
+
@@ -503,8 +503,8 @@
+media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp
Index: propsdlgplugin/propertiespage.cpp
===================================================================
---- propsdlgplugin/propertiespage.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/propertiespage.cpp (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/propertiespage.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/propertiespage.cpp (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,217 @@
+/*
+ Copyright (c) 2004 Jan Schaefer
@@ -725,8 +725,8 @@
+#include "propertiespage.moc"
Index: propsdlgplugin/propertiespagegui.ui
===================================================================
---- propsdlgplugin/propertiespagegui.ui (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/propertiespagegui.ui (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/propertiespagegui.ui (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/propertiespagegui.ui (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,390 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>PropertiesPageGUI</class>
@@ -1120,8 +1120,8 @@
+</UI>
Index: propsdlgplugin/propsdlgshareplugin.cpp
===================================================================
---- propsdlgplugin/propsdlgshareplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 0)
-+++ propsdlgplugin/propsdlgshareplugin.cpp (.../work/coolos_media) (revision 521818)
+--- propsdlgplugin/propsdlgshareplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 0)
++++ propsdlgplugin/propsdlgshareplugin.cpp (.../work/coolos_media) (Revision 523597)
@@ -0,0 +1,100 @@
+/*
+ Copyright (c) 2004 Jan Schaefer
@@ -1224,7 +1224,7 @@
+#include "propsdlgshareplugin.moc"
+
-Property changes on: propsdlgplugin
+Eigenschaftsänderungen: propsdlgplugin
___________________________________________________________________
Name: svn:ignore
+ propertiespagegui.cpp
@@ -1239,8 +1239,8 @@
Index: mediamanager/mediamanager.cpp
===================================================================
---- mediamanager/mediamanager.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mediamanager/mediamanager.cpp (.../work/coolos_media) (revision 521818)
+--- mediamanager/mediamanager.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mediamanager/mediamanager.cpp (.../work/coolos_media) (Revision 523597)
@@ -76,14 +76,15 @@
}
@@ -1355,8 +1355,8 @@
const QPtrList<Medium> media = m_mediaList.list();
Index: mediamanager/halbackend.cpp
===================================================================
---- mediamanager/halbackend.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mediamanager/halbackend.cpp (.../work/coolos_media) (revision 521818)
+--- mediamanager/halbackend.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mediamanager/halbackend.cpp (.../work/coolos_media) (Revision 523597)
@@ -21,9 +21,16 @@
#include
@@ -1842,7 +1842,7 @@
+
+ for (; it!=end; ++it)
+ {
-+ if ((*it)->mountedFrom() == medium->deviceNode() || (*it)->realDeviceName() == medium->deviceNode())
++ if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) )
+ {
+ QStringList opts = (*it)->mountOptions();
+ if (opts.contains("user"))
@@ -1861,7 +1861,7 @@
+ QString mountPoint = isInFstab(medium);
+ if (!mountPoint.isNull())
+ {
-+ kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << endl;
++ kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl;
+ KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint );
+ connect(job, SIGNAL( result (KIO::Job *)),
+ SLOT( slotResult( KIO::Job *)));
@@ -2048,8 +2048,8 @@
#include "halbackend.moc"
Index: mediamanager/mediamanager.h
===================================================================
---- mediamanager/mediamanager.h (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mediamanager/mediamanager.h (.../work/coolos_media) (revision 521818)
+--- mediamanager/mediamanager.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mediamanager/mediamanager.h (.../work/coolos_media) (Revision 523597)
@@ -28,6 +28,7 @@
#include "removablebackend.h"
#include "mediadirnotify.h"
@@ -2081,8 +2081,8 @@
Index: mediamanager/halbackend.h
===================================================================
---- mediamanager/halbackend.h (.../KDE/3.5/kdebase/kioslave/media) (revision 501904)
-+++ mediamanager/halbackend.h (.../work/coolos_media) (revision 521818)
+--- mediamanager/halbackend.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904)
++++ mediamanager/halbackend.h (.../work/coolos_media) (Revision 523597)
@@ -104,6 +104,9 @@
#define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability)
#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...