rev 7183 - in kde-extras/kdebluetooth/trunk/debian: . patches
Michael Meskes
meskes at alioth.debian.org
Tue Sep 4 11:37:09 UTC 2007
Author: meskes
Date: 2007-09-04 11:37:09 +0000 (Tue, 04 Sep 2007)
New Revision: 7183
Added:
kde-extras/kdebluetooth/trunk/debian/patches/01_obex2_push.patch
kde-extras/kdebluetooth/trunk/debian/patches/02_obex2_make_up_work.patch
kde-extras/kdebluetooth/trunk/debian/patches/03_fix_input_tool_segfault.patch
kde-extras/kdebluetooth/trunk/debian/patches/04_no_autostart.patch
Modified:
kde-extras/kdebluetooth/trunk/debian/changelog
kde-extras/kdebluetooth/trunk/debian/control
kde-extras/kdebluetooth/trunk/debian/kdebluetooth.install
kde-extras/kdebluetooth/trunk/debian/rules
Log:
Added some patches and Achims kblueplugd script.
Made sure kbtobexsrv is in the right package.
Finally release first version for Debian.
Modified: kde-extras/kdebluetooth/trunk/debian/changelog
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/changelog 2007-09-04 08:01:24 UTC (rev 7182)
+++ kde-extras/kdebluetooth/trunk/debian/changelog 2007-09-04 11:37:09 UTC (rev 7183)
@@ -1,9 +1,24 @@
-kdebluetooth (1.0~beta6-1) UNRELEASED; urgency=low
+kdebluetooth (1.0~beta6-1) unstable; urgency=low
- * (NOT RELEASED YET) New upstream release
+ [ Mark Purcell ]
+ * New upstream release
- -- Mark Purcell <msp at debian.org> Sat, 11 Aug 2007 11:31:09 +0100
+ [ Michael Meskes ]
+ * Added the following patches:
+ - Stefan Skotte <sfs at enhance-it.dk>: allow more than 16kB object push
+ uploads
+ - Frode M. Døving <frode at lnix.net>: fix "UP" button usage when browsing via
+ obex protocol
+ - Anthony Mercatante <tonio at ubuntu.com>:
+ - fix segfault for the input devices tool
+ - do not install autostart file
+ * Added debian/kblueplugd and debian/kblueplugd.desktop script from
+ Achim Bohnet <ach at mpe.mpg.de> to start kbluetooth automatically when a bluetooth
+ device is plugged and, and stop when no bluetooth device is available.
+ * Finally release first version for Debian.
+ -- Michael Meskes <meskes at debian.org> Mon, 03 Sep 2007 14:56:18 +0200
+
kdebluetooth (1.0~beta5-1) UNRELEASED; urgency=low
* NOT RELEASED YET
@@ -59,6 +74,14 @@
-- Fathi Boudra <fboudra at free.fr> Sat, 04 Aug 2007 10:10:21 +0200
+kdebluetooth (0.99+1.0beta2-8) unstable; urgency=low
+
+ * Updated passkey-agent, closes: #436519
+ * As discussed during DebConf7 move this package to team maintence:
+ + Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>.
+
+ -- Michael Meskes <meskes at debian.org> Wed, 08 Aug 2007 13:28:29 +0200
+
kdebluetooth (0.99+1.0beta2-7) unstable; urgency=low
* Only create link in postinst if bluetooth device was found and
Modified: kde-extras/kdebluetooth/trunk/debian/control
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/control 2007-09-04 08:01:24 UTC (rev 7182)
+++ kde-extras/kdebluetooth/trunk/debian/control 2007-09-04 11:37:09 UTC (rev 7183)
@@ -10,7 +10,7 @@
Package: kdebluetooth
Architecture: any
-Depends: ${shlibs:Depends}, bluez-utils (>= 3.13)
+Depends: ${shlibs:Depends}, bluez-utils (>= 3.13), python-qt4-dbus, python-qt4
Suggests: python
Description: KDE Bluetooth Framework
The KDE Bluetooth Framework is a set of tools built on top of Linux' Bluetooth
@@ -25,7 +25,7 @@
* kinputwizard -- a wizard to configure Input Devices
* kbluelock -- a bluetooth screen locker
.
- Homepage: http://bluetooth.kmobiletools.org
+ Homepage: http://bluetooth.kmobiletools.org
Package: libkbluetooth0
Architecture: any
@@ -38,7 +38,7 @@
.
See the 'kdebluetooth' package for more informations.
.
- Homepage: http://bluetooth.kmobiletools.org
+ Homepage: http://bluetooth.kmobiletools.org
Package: libkbluetooth-dev
Architecture: any
@@ -50,4 +50,4 @@
.
See the 'kdebluetooth' package for more informations.
.
- Homepage: http://bluetooth.kmobiletools.org
+ Homepage: http://bluetooth.kmobiletools.org
Modified: kde-extras/kdebluetooth/trunk/debian/kdebluetooth.install
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/kdebluetooth.install 2007-09-04 08:01:24 UTC (rev 7182)
+++ kde-extras/kdebluetooth/trunk/debian/kdebluetooth.install 2007-09-04 11:37:09 UTC (rev 7183)
@@ -1,2 +1,3 @@
usr/share/*
usr/bin/*
+usr/lib/kdebluetooth/*
Added: kde-extras/kdebluetooth/trunk/debian/patches/01_obex2_push.patch
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/patches/01_obex2_push.patch (rev 0)
+++ kde-extras/kdebluetooth/trunk/debian/patches/01_obex2_push.patch 2007-09-04 11:37:09 UTC (rev 7183)
@@ -0,0 +1,31 @@
+diff -Nur kdebluetooth-1.0~beta4/kdebluetooth/kioslave/obex/kio_obex2/kio_obexprotocol.cpp kdebluetooth-1.0~beta4.new/kdebluetooth/kioslave/obex/kio_obex2/kio_obexprotocol.cpp
+--- kdebluetooth-1.0~beta4/kdebluetooth/kioslave/obex/kio_obex2/kio_obexprotocol.cpp 2007-07-30 17:34:29.000000000 +0200
++++ kdebluetooth-1.0~beta4.new/kdebluetooth/kioslave/obex/kio_obex2/kio_obexprotocol.cpp 2007-08-01 23:16:21.000000000 +0200
+@@ -211,14 +211,23 @@
+ kdDebug() << "kio_obexProtocol::put() URL: " << url << "; permissions: " << permissions << "; overwrite: " << overwrite << "; resume: " << resume << endl;
+
+ QByteArray buffer;
+- dataReq();
++ QByteArray mDataBuffer;
++
++ int result;
+ int ret = 0;
+
+- int result = readData( buffer );
+- if ( result ) {
+- ret = m_impl.wrapper()->putFile( url.path(), buffer.data(), buffer.size() );
++ while ( 0 < (dataReq(), result = readData (buffer) ) )
++ {
++ kdDebug() << "result: " << result << endl;
++ uint oldSize = mDataBuffer.size();
++ mDataBuffer.resize( oldSize+result );
++ ::memcpy( mDataBuffer.data()+oldSize, buffer.data(), result );
+ }
+
++ kdDebug() << "mDataBuffer size: " << mDataBuffer.size() << endl;
++
++ ret = m_impl.wrapper()->putFile( url.path(), mDataBuffer.data(), mDataBuffer.size() );
++
+ kdDebug() << "SendData result code: " << ret << endl;
+
+ finished();
Added: kde-extras/kdebluetooth/trunk/debian/patches/02_obex2_make_up_work.patch
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/patches/02_obex2_make_up_work.patch (rev 0)
+++ kde-extras/kdebluetooth/trunk/debian/patches/02_obex2_make_up_work.patch 2007-09-04 11:37:09 UTC (rev 7183)
@@ -0,0 +1,25 @@
+diff -Nur kdebluetooth-1.0~beta5~r695881/kdebluetooth/kioslave/obex/kio_obex2/kio_obexprotocol.cpp kdebluetooth-1.0~beta5~r695881.new/kdebluetooth/kioslave/obex/kio_obex2/kio_obexprotocol.cpp
+--- kdebluetooth-1.0~beta5~r695881/kdebluetooth/kioslave/obex/kio_obex2/kio_obexprotocol.cpp 2007-08-03 10:12:41.000000000 +0200
++++ kdebluetooth-1.0~beta5~r695881.new/kdebluetooth/kioslave/obex/kio_obex2/kio_obexprotocol.cpp 2007-08-03 10:13:35.000000000 +0200
+@@ -72,7 +72,8 @@
+ {
+ kdDebug() << "kio_obexProtocol::setHost(host=" << host << ", port=" << port << ", user=" << user <<", pass=" << pass << ")\n";
+ QString bhost=user;
+- bhost=bhost.replace('\\', "/");
++ bhost=bhost.replace('\\', '/');
++ bhost=bhost.replace('-',':');
+ if(bhost.contains("nodevice")) bhost=QString::null;
+ /**
+ this is what i have in mind:
+diff -Nur kdebluetooth-1.0~beta5~r695881/kdebluetooth/kioslave/sdp/btsdp.cpp kdebluetooth-1.0~beta5~r695881.new/kdebluetooth/kioslave/sdp/btsdp.cpp
+--- kdebluetooth-1.0~beta5~r695881/kdebluetooth/kioslave/sdp/btsdp.cpp 2007-08-02 13:27:40.000000000 +0200
++++ kdebluetooth-1.0~beta5~r695881.new/kdebluetooth/kioslave/sdp/btsdp.cpp 2007-08-03 10:14:19.000000000 +0200
+@@ -228,7 +228,7 @@
+ // OBEX ftp service:
+ KURL obexFtpURL;
+ obexFtpURL.setProtocol("obex2");
+- obexFtpURL.setUser(mAddress);
++ obexFtpURL.setUser(mAddress.replace(':','-'));
+ obexFtpURL.setHost("bluetooth");
+ if (record.rfcommChannel() > 0) {
+ obexFtpURL.setPort(record.rfcommChannel());
Added: kde-extras/kdebluetooth/trunk/debian/patches/03_fix_input_tool_segfault.patch
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/patches/03_fix_input_tool_segfault.patch (rev 0)
+++ kde-extras/kdebluetooth/trunk/debian/patches/03_fix_input_tool_segfault.patch 2007-09-04 11:37:09 UTC (rev 7183)
@@ -0,0 +1,12 @@
+diff -Nur kdebluetooth-1.0~beta6~r705625/kdebluetooth/libkbluetooth/service.h kdebluetooth-1.0~beta6~r705625.new/kdebluetooth/libkbluetooth/service.h
+--- kdebluetooth-1.0~beta6~r705625/kdebluetooth/libkbluetooth/service.h 2007-08-20 11:49:11.000000000 +0200
++++ kdebluetooth-1.0~beta6~r705625.new/kdebluetooth/libkbluetooth/service.h 2007-08-29 14:01:22.000000000 +0200
+@@ -30,7 +30,7 @@
+ #include "dbussignal.h"
+ #include "dbusfilter.h"
+
+-#define INTERFACE_SERVICE "org.bluez.Service"
++#define INTERFACE_SERVICE "org.bluez.input.Service"
+
+ namespace KBluetooth
+ {
Added: kde-extras/kdebluetooth/trunk/debian/patches/04_no_autostart.patch
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/patches/04_no_autostart.patch (rev 0)
+++ kde-extras/kdebluetooth/trunk/debian/patches/04_no_autostart.patch 2007-09-04 11:37:09 UTC (rev 7183)
@@ -0,0 +1,15 @@
+diff -Nur kdebluetooth-1.0~beta6~r706091/kdebluetooth/kbluetooth/Makefile.am kdebluetooth-1.0~beta6~r706091.new/kdebluetooth/kbluetooth/Makefile.am
+--- kdebluetooth-1.0~beta6~r706091/kdebluetooth/kbluetooth/Makefile.am 2007-08-29 14:03:27.000000000 +0200
++++ kdebluetooth-1.0~beta6~r706091.new/kdebluetooth/kbluetooth/Makefile.am 2007-08-29 16:39:13.000000000 +0200
+@@ -12,11 +12,6 @@
+ #shelldesktop_DATA = kbluetooth.desktop
+ xdg_apps_DATA = kbluetooth.desktop
+
+-# Autostart entry
+-autostartdir = $(datadir)/autostart
+-autostart_DATA = kbluetooth.autostart.desktop
+-
+-
+ #EXTRA_DIST = $(kbluetooth_SOURCES)\
+ # $(kde_servicetypes_DATA) \
+ # eventsrc
Modified: kde-extras/kdebluetooth/trunk/debian/rules
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/rules 2007-09-04 08:01:24 UTC (rev 7182)
+++ kde-extras/kdebluetooth/trunk/debian/rules 2007-09-04 11:37:09 UTC (rev 7183)
@@ -7,3 +7,8 @@
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
+install/kdebluetooth::
+ dh_installdirs usr/share/autostart usr/bin
+ install -m755 debian/kblueplugd debian/kdebluetooth/usr/bin/
+ install -m644 debian/kblueplugd.desktop debian/kdebluetooth/usr/share/autostart/
+
More information about the pkg-kde-commits
mailing list