[SCM] Debian packaging for kdebluetooth4 branch, master, updated. debian/0.3-1-26-g576683a

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 5af18e6fff6fb08fdc68b3418c8a498dda826ae5
Author: Fathi Boudra <fabo at kde.org>
Date:   Thu Mar 4 17:05:02 2010 +0100

    * Merge from Ubuntu:
      - Add build-depend on shard-desktop-ontologies for Nepomuk support
        (LP: #354860)
      - Don't depend on the bluetooth metapackage, but instead on the individual
        packages (bluez, bluez-alsa and bluez-cups).
        bluetooth also includes bluez-gstreamer which is undesirable for KDE
---
 debian/changelog |   11 ++++++++---
 debian/control   |    6 ++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e56ca81..a9cbb5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,10 @@
 kdebluetooth (1:0.4.2-1) UNRELEASED; urgency=low
 
-  * New upstream release
+  * New upstream release - Imported upstream version 0.4.2
 
   [ Didier Raboud ]
-  * Imported upstream version 0.4.2
   * Change Homepage from SourceForge to KDE-Apps.org
-  * Merging from Ubuntu:
+  * Merge from Ubuntu:
     - Raise an exception and exit when DBus is unavailable rather than
       crashing (LP: #139154)
     - Remove build-depend on libknotificationitem-dev; the library got
@@ -23,6 +22,12 @@ kdebluetooth (1:0.4.2-1) UNRELEASED; urgency=low
   * Update debian/rules:
     - Enable parallel build (pass --parallel option to dh)
     - Use kde sequence addon (pass --with kde option to dh)
+  * Merge from Ubuntu:
+    - Add build-depend on shard-desktop-ontologies for Nepomuk support
+      (LP: #354860)
+    - Don't depend on the bluetooth metapackage, but instead on the individual
+      packages (bluez, bluez-alsa and bluez-cups).
+      bluetooth also includes bluez-gstreamer which is undesirable for KDE
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 04 Mar 2010 16:05:42 +0100
 
diff --git a/debian/control b/debian/control
index 0fff847..dca0ddc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Michael Meskes <meskes at debian.org>, Achim Bohnet <ach at mpe.mpg.de>,
  Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>,
  Didier Raboud <didier at raboud.com>
 Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.6.5),
- kdelibs5-dev (>= 4:4.3.73), kdebase-workspace-dev (>= 4:4.2.96)
+ kdelibs5-dev (>= 4:4.3.73), kdebase-workspace-dev (>= 4:4.2.96),
+ shared-desktop-ontologies
 Standards-Version: 3.8.4
 Homepage: http://kde-apps.org/content/show.php/kbluetooth?content=112110
 Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/kdebluetooth4.git
@@ -15,7 +16,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/kdebluetooth4.git
 Package: kdebluetooth
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- bluetooth, obex-data-server, python-qt4-dbus, python-qt4
+ bluez, obex-data-server, python-qt4-dbus, python-qt4
+Recommends: bluez-alsa, bluez-cups
 Suggests: python
 Description: KDE Bluetooth Framework
  The KDE Bluetooth Framework is a set of tools built on top of Linux' Bluetooth

-- 
Debian packaging for kdebluetooth4