SOURCES: kdebluetooth-debian.patch (NEW), kdebluetooth-gcc.patch (...

[arekm]

Author: arekm                        Date: Tue Apr 25 22:03:15 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixes from debian including gcc one

---- Files affected:
SOURCES:
   kdebluetooth-debian.patch (NONE -> 1.1)  (NEW), kdebluetooth-gcc.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SOURCES/kdebluetooth-debian.patch
diff -u /dev/null SOURCES/kdebluetooth-debian.patch:1.1
--- /dev/null	Wed Apr 26 00:03:15 2006
+++ SOURCES/kdebluetooth-debian.patch	Wed Apr 26 00:03:10 2006
@@ -0,0 +1,106 @@
+--- kdebluetooth-0.99+1.0beta1.orig/kdebluetooth/kioslave/bluetooth/bluetooth.protocol
++++ kdebluetooth-0.99+1.0beta1/kdebluetooth/kioslave/bluetooth/bluetooth.protocol
+@@ -4,6 +4,7 @@
+ input=none
+ output=filesystem
+ reading=true
++listing=Name,Type
+ Icon=kdebluetooth
+ Description=Bluetooth inquiry protocol
+ Description[da]=Bluetooth forespørgselsprotokol
+--- kdebluetooth-0.99+1.0beta1.orig/kdebluetooth/kioslave/sdp/btsdp.cpp
++++ kdebluetooth-0.99+1.0beta1/kdebluetooth/kioslave/sdp/btsdp.cpp
+@@ -131,12 +131,21 @@
+         if (path == "/")
+         {
+             createDirEntry(entry, "Bluetooth neighbourhood");
++            statEntry(entry);
+             finished();
+         }
+         else
+         {
+-            error(KIO::ERR_SLAVE_DEFINED,
++            QRegExp reg = QRegExp("^/uuid-(0x[a-f,A-F,0-9:]+)/");
++            if (reg.search(path) >= 0) {
++                createDirEntry(entry, "More services");
++                statEntry(entry);
++                finished();
++            }
++            else {
++            	error(KIO::ERR_SLAVE_DEFINED,
+                   i18n("Could not stat %1. Unknown device").arg(url.url()));
++            }
+         }
+     }
+     else {
+--- kdebluetooth-0.99+1.0beta1.orig/kdebluetooth/kioslave/sdp/btsdp.protocol
++++ kdebluetooth-0.99+1.0beta1/kdebluetooth/kioslave/sdp/btsdp.protocol
+@@ -5,6 +5,7 @@
+ output=filesystem
+ reading=true
+ Icon=kdebluetooth
++listing=Name,Type
+ Description=Bluetooth service discovery protocol
+ Description[da]=Bluetooth-protokol til opdagelse af serviceydelser
+ Description[et]=Bluetoothi teenuste avastamise protokoll
+--- kdebluetooth-0.99+1.0beta1.orig/kdebluetooth/irmcsync/irmcsynckonnector/clientmanager.h
++++ kdebluetooth-0.99+1.0beta1/kdebluetooth/irmcsync/irmcsynckonnector/clientmanager.h
+@@ -58,7 +58,7 @@
+ 		~ClientManager();
+ 
+ 
+-		void ClientManager::setObexClient(Client*);
++		void setObexClient(Client*);
+ 
+ 		/**
+ 		   Returns if the worker is idel at the monment.
+--- kdebluetooth-0.99+1.0beta1.orig/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop
++++ kdebluetooth-0.99+1.0beta1/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop
+@@ -3,6 +3,7 @@
+ Type=MimeType
+ MimeType=bluetooth/computer-device-class
+ Icon=konsole
++X-KDE-IsAlso=inode/directory
+ Comment=Computer/PDA Bluetooth Device
+ Comment[bg]=КОПпютърнО/PDA ŃƒŃŃ‚Ń€ĐžĐšŃŃ‚Đ˛Đž Bluetooth
+ Comment[bs]=Računar/PDA Bluetooth uređaj
+--- kdebluetooth-0.99+1.0beta1.orig/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp
++++ kdebluetooth-0.99+1.0beta1/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp
+@@ -64,6 +64,7 @@
+     if (url.hasHost() == false && path == "/")
+     {
+         createDirEntry(entry, "Bluetooth neighbourhood");
++        statEntry(entry);
+         finished();
+     }
+     else {
+@@ -284,7 +285,8 @@
+ 
+     addAtom(entry, UDS_MIME_TYPE, mimeType);
+     addAtom(entry, UDS_FILE_TYPE, S_IFDIR);
+-    addAtom(entry, UDS_GUESSED_MIME_TYPE, "inode/folder");
++    // No more necessary
++    // addAtom(entry, UDS_GUESSED_MIME_TYPE, "inode/folder");
+ 
+     return true;
+ }
+--- kdebluetooth-0.99+1.0beta1.orig/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop
++++ kdebluetooth-0.99+1.0beta1/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop
+@@ -3,6 +3,7 @@
+ Type=MimeType
+ MimeType=bluetooth/misc-device-class
+ Icon=kdebluetooth
++X-KDE-IsAlso=inode/directory
+ Comment=Miscellaneous Bluetooth Device
+ Comment[bg]=РаСни ŃƒŃŃ‚Ń€ĐžĐšŃŃ‚Đ˛Đ° Bluetooth
+ Comment[da]=Diverse Bluetooth-enheder
+--- kdebluetooth-0.99+1.0beta1.orig/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop
++++ kdebluetooth-0.99+1.0beta1/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop
+@@ -3,6 +3,7 @@
+ Type=MimeType
+ MimeType=bluetooth/phone-device-class
+ Icon=kaddressbook
++X-KDE-IsAlso=inode/directory
+ Comment=Phone Bluetooth Device
+ Comment[bg]=ТоНофОннО ŃƒŃŃ‚Ń€ĐžĐšŃŃ‚Đ˛Đž Bluetooth
+ Comment[da]=Telefon Bluetooth-enhed
================================================================