rev 7222 - in kde-extras/kdebluetooth/trunk/debian: . patches

[Michael Meskes]

Author: meskes
Date: 2007-09-10 12:24:58 +0000 (Mon, 10 Sep 2007)
New Revision: 7222

Added:
   kde-extras/kdebluetooth/trunk/debian/patches/05_header_includes.patch
Modified:
   kde-extras/kdebluetooth/trunk/debian/changelog
   kde-extras/kdebluetooth/trunk/debian/kdebluetooth.install
   kde-extras/kdebluetooth/trunk/debian/libkbluetooth-dev.install
   kde-extras/kdebluetooth/trunk/debian/libkbluetooth0.install
Log:
Working on a beta7 release.



Modified: kde-extras/kdebluetooth/trunk/debian/changelog
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/changelog	2007-09-09 14:26:40 UTC (rev 7221)
+++ kde-extras/kdebluetooth/trunk/debian/changelog	2007-09-10 12:24:58 UTC (rev 7222)
@@ -1,8 +1,12 @@
 kdebluetooth (1.0~beta7-1) unstable; urgency=low
 
   * New upstream version
+  * Added copyright update by Fathi Boudra <fboudra at free.fr> who checked the
+    GFDL stuff.
+  * Added a quick patch to fix build problems.
+  * Moved libtools files for kio slaves to library package.
 
- -- Michael Meskes <michael at feivel.credativ.de>  Wed, 05 Sep 2007 10:51:44 +0200
+ -- Michael Meskes <meskes at debian.org>  Mon, 10 Sep 2007 14:01:23 +0200
 
 kdebluetooth (1.0~beta6-1) unstable; urgency=low
 

Modified: kde-extras/kdebluetooth/trunk/debian/kdebluetooth.install
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/kdebluetooth.install	2007-09-09 14:26:40 UTC (rev 7221)
+++ kde-extras/kdebluetooth/trunk/debian/kdebluetooth.install	2007-09-10 12:24:58 UTC (rev 7222)
@@ -1,3 +1,4 @@
 usr/share/*
 usr/bin/*
 usr/lib/kdebluetooth/*
+

Modified: kde-extras/kdebluetooth/trunk/debian/libkbluetooth-dev.install
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/libkbluetooth-dev.install	2007-09-09 14:26:40 UTC (rev 7221)
+++ kde-extras/kdebluetooth/trunk/debian/libkbluetooth-dev.install	2007-09-10 12:24:58 UTC (rev 7222)
@@ -2,4 +2,3 @@
 usr/lib/lib*.la
 usr/lib/lib*.so
 usr/lib/*.la
-usr/lib/kde3/*.la

Modified: kde-extras/kdebluetooth/trunk/debian/libkbluetooth0.install
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/libkbluetooth0.install	2007-09-09 14:26:40 UTC (rev 7221)
+++ kde-extras/kdebluetooth/trunk/debian/libkbluetooth0.install	2007-09-10 12:24:58 UTC (rev 7222)
@@ -1,2 +1,3 @@
 usr/lib/lib*.so.*
-usr/lib/kde3/*.so
+usr/lib/kde3/*
+

Added: kde-extras/kdebluetooth/trunk/debian/patches/05_header_includes.patch
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/patches/05_header_includes.patch	                        (rev 0)
+++ kde-extras/kdebluetooth/trunk/debian/patches/05_header_includes.patch	2007-09-10 12:24:58 UTC (rev 7222)
@@ -0,0 +1,24 @@
+diff -ruN kdebluetooth-1.0_beta7/kdebluetooth/libkbluetooth/adapter_old.cpp kdebluetooth-1.0_beta7.new/kdebluetooth/libkbluetooth/adapter_old.cpp
+--- kdebluetooth-1.0_beta7/kdebluetooth/libkbluetooth/adapter_old.cpp	2007-09-03 16:49:09.000000000 +0200
++++ kdebluetooth-1.0_beta7.new/kdebluetooth/libkbluetooth/adapter_old.cpp	2007-09-10 13:43:34.000000000 +0200
+@@ -33,7 +33,7 @@
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/hci.h>
+ #include <bluetooth/hci_lib.h>
+-#include <hcisocket.h>
++#include "hcisocket.h"
+ 
+ namespace KBluetooth
+ {
+diff -ruN kdebluetooth-1.0_beta7/kdebluetooth/libkbluetooth/serviceselectionwidget.h kdebluetooth-1.0_beta7.new/kdebluetooth/libkbluetooth/serviceselectionwidget.h
+--- kdebluetooth-1.0_beta7/kdebluetooth/libkbluetooth/serviceselectionwidget.h	2007-09-03 16:49:09.000000000 +0200
++++ kdebluetooth-1.0_beta7.new/kdebluetooth/libkbluetooth/serviceselectionwidget.h	2007-09-10 13:48:32.000000000 +0200
+@@ -15,7 +15,7 @@
+ #include <qwidget.h>
+ #include <qstringlist.h>
+ #include "servicediscovery.h"
+-#include "serviceselectionwidgetbase.h"
++#include "../libkbluetooth/serviceselectionwidgetbase.h"
+ #include <kpixmap.h>
+ #include <map>
+