Hello community,
here is the log from the commit of package kdebluetooth
checked in at Fri Sep 1 12:43:12 CEST 2006.
--------
--- KDE/kdebluetooth/kdebluetooth.changes 2006-08-24 14:11:18.000000000 +0200
+++ kdebluetooth/kdebluetooth.changes 2006-09-01 12:15:09.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Sep 1 12:15:05 CEST 2006 - dmueller@suse.de
+
+- fix build for x86_64
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebluetooth.spec ++++++
--- /var/tmp/diff_new_pack.S4tOhs/_old 2006-09-01 12:41:47.000000000 +0200
+++ /var/tmp/diff_new_pack.S4tOhs/_new 2006-09-01 12:41:47.000000000 +0200
@@ -20,7 +20,7 @@
Group: Hardware/Other
Summary: Bluetooth Support for KDE
Version: 0.99.0svn576598
-Release: 1
+Release: 3
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# svn2dist extragear-pim kdebluetooth
Source0: %name-%version.tar.bz2
@@ -122,6 +122,8 @@
/opt/kde3/share/locale
%changelog -n kdebluetooth
+* Fri Sep 01 2006 - dmueller@suse.de
+- fix build for x86_64
* Thu Aug 24 2006 - dmueller@suse.de
- update to r576598 :
* fix various build issues
++++++ better-menu-names.diff ++++++
--- /var/tmp/diff_new_pack.S4tOhs/_old 2006-09-01 12:41:47.000000000 +0200
+++ /var/tmp/diff_new_pack.S4tOhs/_new 2006-09-01 12:41:47.000000000 +0200
@@ -1,7 +1,39 @@
Index: kdebluetooth/kdebluetooth-common/Makefile.am
-===================================================================
---- kdebluetooth/kdebluetooth-common/Makefile.am (Revision 449139)
-+++ kdebluetooth/kdebluetooth-common/Makefile.am (Arbeitskopie)
+================================================================================
+--- kdebluetooth/kbtobexclient/kbtobexclient.desktop
++++ kdebluetooth/kbtobexclient/kbtobexclient.desktop
+@@ -4,10 +4,7 @@
+ Icon=kdebluetooth
+ Type=Application
+ MimeType=bluetooth/obex-object-push-profile
+-Name=kbtobexclient
+-Name[ta]=kbtobex கிளைஞ்சன்
+-Name[tr]=kbtobexistemcisi
+-Name[xx]=xxkbtobexclientxx
++Name=Send File via Bluetooth
+ GenericName=Bluetooth OBEX Client
+ GenericName[bg]=OBEX клиент за Bluetooth
+ GenericName[br]=Arlun OBEX Bluetooth
+--- kdebluetooth/kbtserialchat/kbtserialchat.desktop
++++ kdebluetooth/kbtserialchat/kbtserialchat.desktop
+@@ -5,9 +5,7 @@
+ Type=Application
+ MimeType=bluetooth/serial-port-profile
+ Name=kbtserialchat
+-Name[sv]=Kbtserialchat
+-Name[tr]=kbtserisohbet
+-Name[xx]=xxkbtserialchatxx
++Name=Bluetooth Terminal
+ GenericName=Bluetooth Chat
+ GenericName[bg]=Разговор с Bluetooth
+ GenericName[br]=Flapañ gant Bluetooth
+@@ -57,3 +55,4 @@
+ Comment[ta]=புலுடுத்துக்கான சிறிய முடிவு பயன்பாடு.
+ Comment[tr]=Bluetooth için küçük seri terminal uygulaması
+ Comment[xx]=xxSmall serial terminal application for Bluetoothxx
++X-SuSE-Unimportant=true
+--- kdebluetooth/kdebluetooth-common/Makefile.am
++++ kdebluetooth/kdebluetooth-common/Makefile.am
@@ -7,18 +7,6 @@
EXTRA_DIST = $(kde_servicetypes_DATA)
@@ -21,38 +53,3 @@
# Update scripts
#update_DATA = kdebluetooth.upd kdebluetooth.sh
#updatedir = $(kde_datadir)/kconf_update
-Index: kdebluetooth/kbtserialchat/kbtserialchat.desktop
-Index: kdebluetooth/kbtobexclient/kbtobexclient.desktop
-===================================================================
---- kdebluetooth/kbtserialchat/kbtserialchat.desktop 2005/12/02 11:56:23 1.1
-+++ kdebluetooth/kbtserialchat/kbtserialchat.desktop 2005/12/02 11:57:48
-@@ -5,9 +5,7 @@
- Type=Application
- MimeType=bluetooth/serial-port-profile
- Name=kbtserialchat
--Name[sv]=Kbtserialchat
--Name[tr]=kbtserisohbet
--Name[xx]=xxkbtserialchatxx
-+Name=Bluetooth Terminal
- GenericName=Bluetooth Chat
- GenericName[br]=Flapañ gant Bluetooth
- GenericName[el]=Συνομιλία Bluetooth
-@@ -45,3 +43,4 @@
- Comment[ta]=புலுடுத்துக்கான சிறிய முடிவு பயன்பாடு.
- Comment[tr]=Bluetooth için küçük seri terminal uygulaması
- Comment[xx]=xxSmall serial terminal application for Bluetoothxx
-+X-SuSE-Unimportant=true
---- kdebluetooth/kbtobexclient/kbtobexclient.desktop 2005/12/02 11:58:30 1.1
-+++ kdebluetooth/kbtobexclient/kbtobexclient.desktop 2005/12/02 11:59:10
-@@ -4,10 +4,7 @@
- Icon=kdebluetooth
- Type=Application
- MimeType=bluetooth/obex-object-push-profile
--Name=kbtobexclient
--Name[ta]=kbtobex கிளைஞ்சன்
--Name[tr]=kbtobexistemcisi
--Name[xx]=xxkbtobexclientxx
-+Name=Send File via Bluetooth
- GenericName=Bluetooth OBEX Client
- GenericName[br]=Arlun OBEX Bluetooth
- GenericName[da]=Bluetooth OBEX-klient
++++++ fixme.diff ++++++
--- /var/tmp/diff_new_pack.S4tOhs/_old 2006-09-01 12:41:47.000000000 +0200
+++ /var/tmp/diff_new_pack.S4tOhs/_new 2006-09-01 12:41:47.000000000 +0200
@@ -9,3 +9,13 @@
# this is where the desktop file will go
#desktopdir = $(kde_appsdir)/System
+--- kdebluetooth/libkbluetooth/Makefile.am
++++ kdebluetooth/libkbluetooth/Makefile.am
+@@ -3,6 +3,7 @@
+
+ libkbluetooth_la_SOURCES = adapter.cpp inquiry.cpp rfcommserversocket.cpp deviceaddress.cpp sdpattribute.cpp sdpdevice.cpp sdpneighbourfactory.cpp sdpneighbourinfo.cpp sdpservice.cpp namerequest.cpp hcisocket.cpp rfcommsocket.cpp scosocket.cpp scoserversocket.cpp servicediscovery.cpp serviceselectionwidgetbase.ui serviceselectionwidget.cpp devicemimeconverter.cpp deviceinputwidget.cpp deviceinputwidgetbase.ui namecache.cpp hcidefault.cpp configinfo.cpp
+
++libkbluetooth_la_LDFLAGS = $(all_libraries)
+ libkbluetooth_la_LIBADD = $(LIB_KIO) $(BLUETOOTH_LIBS)
+ noinst_HEADERS = namerequest.h rfcommsocket.h scosocket.h scoserversocket.h serviceselectionwidget.h deviceinputwidget.h devicemimeconverter.h configinfo.h
+ libkbluetoothincludedir = $(includedir)/kdebluetooth
++++++ kcm-btpaired-fix.diff ++++++
--- /var/tmp/diff_new_pack.S4tOhs/_old 2006-09-01 12:41:47.000000000 +0200
+++ /var/tmp/diff_new_pack.S4tOhs/_new 2006-09-01 12:41:47.000000000 +0200
@@ -6,7 +6,7 @@
<class>FileSettingsBase</class>
<widget class="QWidget">
<property name="name">
-@@ -24,7 +27,7 @@
+@@ -24,7 +24,7 @@
<cstring>textLabel3</cstring>
</property>
<property name="text">
@@ -15,7 +15,7 @@
</property>
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
-@@ -123,7 +126,7 @@
+@@ -123,7 +123,7 @@
<cstring>textLabel1_2</cstring>
</property>
<property name="text">
@@ -24,7 +24,7 @@
</property>
</widget>
<widget class="KURLRequester" row="0" column="1">
-@@ -138,6 +141,9 @@
+@@ -138,6 +138,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
@@ -121,7 +121,7 @@
+
if (bDirty) {
if (KMessageBox::warningContinueCancel(this, i18n(
- "The link key file has changed on disk. Do you want to reload the table and\
+ "The link key file has changed on disk. Do you want to reload the table and \
@@ -98,82 +135,96 @@
return;
}
++++++ kcm-no-dcop-error.diff ++++++
--- /var/tmp/diff_new_pack.S4tOhs/_old 2006-09-01 12:41:47.000000000 +0200
+++ /var/tmp/diff_new_pack.S4tOhs/_new 2006-09-01 12:41:47.000000000 +0200
@@ -1,7 +1,7 @@
Index: kbluetoothd/kcm/servicetab.cpp
-===================================================================
---- kdebluetooth/kbluetoothd/kcm/servicetab.cpp (revision 506310)
-+++ kdebluetooth/kbluetoothd/kcm/servicetab.cpp (working copy)
+================================================================================
+--- kdebluetooth/kbluetoothd/kcm/servicetab.cpp
++++ kdebluetooth/kbluetoothd/kcm/servicetab.cpp
@@ -389,7 +389,7 @@
{
DCOPCall dcop(client, "kbluetoothd", "MetaServer");
@@ -11,10 +11,8 @@
return QStringList();
}
else {
-Index: kbluetoothd/libkbluetoothd/checkdaemon.cpp
-===================================================================
---- kdebluetooth/kbluetoothd/libkbluetoothd/checkdaemon.cpp (revision 506312)
-+++ kdebluetooth/kbluetoothd/libkbluetoothd/checkdaemon.cpp (working copy)
+--- kdebluetooth/kbluetoothd/libkbluetoothd/checkdaemon.cpp
++++ kdebluetooth/kbluetoothd/libkbluetoothd/checkdaemon.cpp
@@ -36,8 +36,8 @@
KMessageBox::information(mainWidget,
i18n("<p>The KDE Bluetooth Daemon (<i>kbluetoothd</i>) is \
++++++ kdebluetooth-newkdepim.diff ++++++
--- /var/tmp/diff_new_pack.S4tOhs/_old 2006-09-01 12:41:47.000000000 +0200
+++ /var/tmp/diff_new_pack.S4tOhs/_new 2006-09-01 12:41:47.000000000 +0200
@@ -1,11 +1,11 @@
--- kdebluetooth/irmcsync/irmcsynckonnector/calendarthread.cpp
-+++ kdebluetooth/irmcsync/irmcsynckonnector/calendarthread.cpp 2005/01/31 08:25:40
++++ kdebluetooth/irmcsync/irmcsynckonnector/calendarthread.cpp
@@ -25,7 +25,7 @@
#include