Update deb packaging files:

+ relax dependencies - strict version numbers are not necessary
+ remove explicitly stated runtime dependencies on libraries
+ remove unnecessary Replaces
+ move SO symlinks (without version number) to -dev packages
+ move org.trinitydesktop.tdebluez.conf to tdebluez package
+ delete unused tdeblueplugd and tdeblueplugd.desktop
+ delete unused tdebluez.preinst

Signed-off-by: Slávek Banko <[email protected]>

10 files changed, 16 insertions, 170 deletions

diff --git a/debian/control b/debian/control
index d8364d7..e5596dc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,14 @@
 Source: tdebluez
 Section: tde
 Priority: optional
-Maintainer: Debian TDE Team <[email protected]>
-Uploaders: ...
-Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libdbus-1-tqt-dev, libdbus-1-3 (>= 1.10.26)
+Maintainer: TDE Debian Team <[email protected]>
+Build-Depends: cdbs, debhelper (>= 9~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libdbus-1-tqt-dev
 Standards-Version: 3.8.0
-#Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kdebluetooth/trunk/
-#Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kdebluetooth/trunk/
 
 Package: tdebluez
 Section: tde
 Architecture: any
-Depends: ${shlibs:Depends}, bluez (>= 5.43), bluez-obexd (>= 5.43), tdelibs14-trinity, libdbus-1-tqt
+Depends: ${shlibs:Depends}, bluez (>= 5~), bluez-obexd (>= 5~)
 Suggests: pulseaudio-module-bluetooth
 Description: TDE Bluetooth Framework
  The TDE Bluetooth Framework is a set of tools built on top of Linux' Bluetooth
@@ -20,7 +17,7 @@ Description: TDE Bluetooth Framework
  straightforward as possible.
  .
  Features:
-  * tdebluez -- a tray applet to handle incoming inquiries and control 
+  * tdebluez -- a tray applet to handle incoming inquiries and control
                 adapters and devices
   * tdebluezauth -- authentication agent
   * tdeioclient -- cli to obex
@@ -28,8 +25,7 @@ Description: TDE Bluetooth Framework
 Package: libtdebluez
 Architecture: any
 Section: libs
-Replaces: libtdebluez (<< 0.1)
-Depends: ${shlibs:Depends}, bluez (>= 5.43)
+Depends: ${shlibs:Depends}, bluez (>= 5~)
 Description: Bluetooth library for TDE
  This package is part of the TDE Bluetooth Framework.
  It contains a Bluetooth library for TDE.
@@ -39,8 +35,7 @@ Description: Bluetooth library for TDE
 Package: libtdeobex
 Architecture: any
 Section: libs
-Replaces: libtdeobex (<< 0.1)
-Depends: ${shlibs:Depends}, bluez (>= 5.43), bluez-obexd (>= 5.43)
+Depends: ${shlibs:Depends}, bluez-obexd (>= 5~)
 Description: Obex library for TDE
  This package is part of the TDE Bluetooth Framework.
  It contains a Bluetooth library for TDE.
@@ -51,7 +46,6 @@ Package: libtdebluez-dev
 Architecture: any
 Section: libdevel
 Depends: libtdebluez (= ${binary:Version})
-Replaces: libtdebluez-dev (<< 0.1)
 Description: development files for libtdebluez
  This package is part of the TDE Bluetooth Framework.
  It contains the development files for libtdebluez.
@@ -61,10 +55,9 @@ Description: development files for libtdebluez
 Package: libtdeobex-dev
 Architecture: any
 Section: libdevel
-Depends: libtdebluez (= ${binary:Version})
-Replaces: libtdebluez-dev (<< 0.1)
-Description: development files for libtdebluez
+Depends: libtdeobex (= ${binary:Version})
+Description: development files for libtdeobex
  This package is part of the TDE Bluetooth Framework.
- It contains the development files for libtdebluez.
+ It contains the development files for libtdeobex.
  .
  See the 'tdebluez' package for more informations.
diff --git a/debian/libtdebluez-dev.install b/debian/libtdebluez-dev.install
index 1593ff2..6425a94 100644
--- a/debian/libtdebluez-dev.install
+++ b/debian/libtdebluez-dev.install
@@ -1,2 +1,3 @@
-opt/trinity/share/cmake/libtdebluez.cmake
 opt/trinity/include/tdebluez/*
+opt/trinity/lib/libtdebluez.so
+opt/trinity/share/cmake/libtdebluez.cmake
diff --git a/debian/libtdebluez.install b/debian/libtdebluez.install
index ef8dc81..72a1ac2 100644
--- a/debian/libtdebluez.install
+++ b/debian/libtdebluez.install
@@ -1,5 +1,2 @@
-opt/trinity/lib/libtdebluez.so.0
-opt/trinity/lib/libtdebluez.so.0.0.1
-opt/trinity/lib/libtdebluez.so
 opt/trinity/lib/libtdebluez.la
-/etc/dbus-1/system.d/org.trinitydesktop.tdebluez.conf
+opt/trinity/lib/libtdebluez.so.*
diff --git a/debian/libtdeobex-dev.install b/debian/libtdeobex-dev.install
index 0e91749..e60909e 100644
--- a/debian/libtdeobex-dev.install
+++ b/debian/libtdeobex-dev.install
@@ -1,2 +1,3 @@
-opt/trinity/share/cmake/libtdeobex.cmake
 opt/trinity/include/tdeobex/*
+opt/trinity/lib/libtdeobex.so
+opt/trinity/share/cmake/libtdeobex.cmake
diff --git a/debian/libtdeobex.install b/debian/libtdeobex.install
index 65642ce..2557b6e 100644
--- a/debian/libtdeobex.install
+++ b/debian/libtdeobex.install
@@ -1,4 +1,2 @@
 opt/trinity/lib/libtdeobex.la
-opt/trinity/lib/libtdeobex.so
-opt/trinity/lib/libtdeobex.so.0
-opt/trinity/lib/libtdeobex.so.0.0.1
+opt/trinity/lib/libtdeobex.so.*
diff --git a/debian/tdeblueplugd b/debian/tdeblueplugd
deleted file mode 100644
index 7d3db40..0000000
--- a/debian/tdeblueplugd
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/python
-# -*- coding: UTF-8 -*-
-"""
-Copyright (C) 2007 Achim Bohnet <[email protected]>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-"""
-
-import sys
-from   PyQt4 import QtCore, QtGui
-import dbus
-#import dbus.mainloop.tqt3
-import dbus.mainloop.qt
-import distutils.spawn
-
-tdebtcmd    = [ 'tdebluetooth' ]
-quitprogs = [ 'tdebluetooth', 'tdebluemon', 'tdeinputwizard' ]  # FIXME: quit tdebluelock too?
-
-
-app = TQtGui.TQApplication(sys.argv)
-if app.isSessionRestored():
-	sys.exit(1)
-	
-dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
-bus = dbus.SystemBus()
-
-try:
-        manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager')
-except:
-        print "Unable to connect to bluez."
-        sys.exit(1)
-
-if len(manager.ListAdapters()):
-        print "# of devices at startup:", len(manager.ListAdapters())
-        distutils.spawn.spawn(kbtcmd)
-else:
-        print "No BT device found"
-
-
-def slotAdapterAdded(device):
-        print "bt dev added:", device, "# of devices:", len(manager.ListAdapters())
-        distutils.spawn.spawn(kbtcmd)
-
-def slotAdapterRemoved(device):
-        print "bt dev removed:", device, "# num of devices:", len(manager.ListAdapters())
-        if len(manager.ListAdapters()) == 0:
-                for p in quitprogs:
-                        print "exiting:", p, " ..."
-                        try:
-                                distutils.spawn.spawn(['dcop', p, 'MainApplication-Interface', 'quit'])
-                        except:
-                                pass
-
-manager.connect_to_signal("AdapterAdded", slotAdapterAdded)
-manager.connect_to_signal("AdapterRemoved", slotAdapterRemoved)
-
-print "waiting for bt device (un)plug events ..."
-app.exec_()
-#sys.exit(app.exec_())
diff --git a/debian/tdeblueplugd.desktop b/debian/tdeblueplugd.desktop
deleted file mode 100644
index 95d37e3..0000000
--- a/debian/tdeblueplugd.desktop
+++ /dev/null
@@ -1,42 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=TDEBluetoothD
-Name[sv]=TDEbluetoothd
-Name[ta]=Kபுலுடுத்D
-Name[xx]=xxTDEBluetoothDxx
-GenericName=TDE Bluetooth Daemon
-GenericName[ar]=مراقب TDE Bluetooth
-GenericName[bg]=Демон за Bluetooth в TDE
-GenericName[br]=Diaoul TDE Bluetooth
-GenericName[bs]=TDE Bluetooth daemon
-GenericName[ca]=Dimoni Bluetooth de TDE
-GenericName[cs]=Bluetooth démon pro TDE
-GenericName[da]=TDE Bluetooth-dæmon
-GenericName[de]=TDE Bluetooth-Daemon
-GenericName[el]=Ο δαίμονας Bluetooth του TDE
-GenericName[es]=Daemon Bluetooth de TDE
-GenericName[et]=TDE Bluetoothi deemon
-GenericName[fr]=Démon TDE Bluetooth
-GenericName[gl]=Servizo Bluetooth de TDE
-GenericName[it]=Demone Bluetooth di TDE
-GenericName[ja]=TDE Bluetooth デーモン
-GenericName[ka]=TDE ბლუთუს დემონი
-GenericName[nl]=TDE Bluetooth-daemon
-GenericName[pa]=TDE ਬਲਿਊਟੁੱਥ ਡਾਈਮੋਨ
-GenericName[pl]=Demon Bluetooth dla TDE
-GenericName[pt]=Serviço Bluetooth do TDE
-GenericName[ru]=Служба TDE Bluetooth
-GenericName[sr]=Bluetooth демон за TDE
-GenericName[sr@Latn]=Bluetooth demon za TDE
-GenericName[sv]=TDE-Blåtandsdemon
-GenericName[ta]=TDE புலுடுத் டேமொன்
-GenericName[tr]=TDE Bluetooth Hizmeti
-GenericName[xx]=xxTDE Bluetooth Daemonxx
-Exec=tdeblueplugd
-Icon=TDEbluetooth
-Type=Application
-DocPath=TDEbluetooth/index.html
-Terminal=false
-X-TDE-autostart-after=panel
-X-TDE-StartupNotify=false
-X-TDE-autostart-condition=tdebluezrc:General:AutoStart:true
diff --git a/debian/tdebluez.install b/debian/tdebluez.install
index 2cb7792..95a00d4 100644
--- a/debian/tdebluez.install
+++ b/debian/tdebluez.install
@@ -22,3 +22,4 @@ opt/trinity/share/services/obexftp.protocol
 opt/trinity/share/services/obexopp.protocol
 opt/trinity/share/apps/konqsidebartng/virtual_folders/services/bluetooth_sidebarentry.desktop
 opt/trinity/share/apps/konqsidebartng/virtual_folders/services/obex_sidebarentry.desktop
+/etc/dbus-1/system.d/org.trinitydesktop.tdebluez.conf
diff --git a/debian/tdebluez.preinst b/debian/tdebluez.preinst
deleted file mode 100644
index 3a28f8c..0000000
--- a/debian/tdebluez.preinst
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-exit 0
-# Remove a no-longer used conffile
-rm_conffile ()
-{
-   PKGNAME="$1"
-   CONFFILE="$2"
-
-   if [ -e "$CONFFILE" ]; then
-    	md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-	old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
-	if [ "$md5sum" != "$old_md5sum" ]; then
-		echo "Obsolete conffile $CONFFILE has been modified by you."
-		echo "Saving as $CONFFILE.dpkg-bak ..."
-		mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-	else
-	        echo "Removing obsolete conffile $CONFFILE ..."
-	        rm -f "$CONFFILE"
-	fi
-   fi
-}
-
-# Last version that might have the obsolete conffile.
-LASTVERSION="0.1"
-case "$1" in install | upgrade)
-	echo "FIXME: tdebluez.preinstall Last version that might have the obsolete conffile"
-# 	if dpkg --compare-versions "$2" le "$LASTVERSION"; then
-# 		rm_conffile tdebluetooth /etc/kde3/obexrc
-# 	fi
-esac
-
-#DEBHELPER#
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 61fdcd4..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,9 +0,0 @@
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to find new files on sourceforge, for debscripts >= 2.9
-#opts=uversionmangle=s/_/-/,dversionmangle=s/~/-/ \
-#  http://cryptomilch.de/~dgollub/kdebluetooth/kdebluetooth-(.*)\.tar\.bz2 debian svn-upgrade
-#  http://sf.net/kde-bluetooth/kdebluetooth-(.*)\.tar\.gz debian svn-upgrade