rev 4719 - in trunk/packages/kdebase/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-10-19 01:02:01 +0000 (Thu, 19 Oct 2006)
New Revision: 4719

Added:
   trunk/packages/kdebase/debian/patches/29_hal_umount.diff
Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/control
Log:
Let's add the revert for now, and test.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-10-18 21:54:38 UTC (rev 4718)
+++ trunk/packages/kdebase/debian/changelog	2006-10-19 01:02:01 UTC (rev 4719)
@@ -1,7 +1,14 @@
-kdebase (4:3.5.5a-3) unstable; urgency=low
+kdebase (4:3.5.5a-3) UNRELEASED; urgency=medium
 
-  * Promote eject from recommends to depends
+  * Promote eject from recommends to depends.
 
+  * Add a patch to try to use HAL for unmounting before ejecting. This should
+    improve user's error messages in case of problems. (This change is
+    actually a revert of an upstream change).
+
+  * Version our build-conflict with nvidia-glx, since newer packages should
+    work. (Closes: #393855)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 18 Oct 2006 14:30:20 +0200
 
 kdebase (4:3.5.5a-2) unstable; urgency=low

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2006-10-18 21:54:38 UTC (rev 4718)
+++ trunk/packages/kdebase/debian/control	2006-10-19 01:02:01 UTC (rev 4719)
@@ -5,7 +5,7 @@
 Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.5), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
-Build-Conflicts: nvidia-glx
+Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.7.2
 
 Package: kdebase

Added: trunk/packages/kdebase/debian/patches/29_hal_umount.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/29_hal_umount.diff	                        (rev 0)
+++ trunk/packages/kdebase/debian/patches/29_hal_umount.diff	2006-10-19 01:02:01 UTC (rev 4719)
@@ -0,0 +1,22 @@
+--- kde.orig/kioslave/media/mounthelper/kio_media_mounthelper.cpp
++++ kde.orig/kioslave/media/mounthelper/kio_media_mounthelper.cpp
+@@ -91,6 +91,19 @@
+ 	}
+ 	else if (args->isSet("s") || args->isSet("e"))
+ 	{
++		if (medium.isMounted())   
++		{   
++		  DCOPRef mediamanager("kded", "mediamanager");   
++		  DCOPReply reply = mediamanager.call( "unmount", medium.id());   
++		  if (reply.isValid())   
++		    reply.get(m_errorStr);   
++		  m_device = device;   
++		  if (!m_errorStr.isNull())   
++		  {   
++		    error();   
++		    return;   
++		  }   
++		}
+ 		invokeEject(device, true);
+ 	}
+ 	else