[SCM] bluedevil packaging branch, master, updated. debian/1.0-rc3-2-3-g11b1b9a

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit 7bdfd0f13db9a57f32349189026a896ad5fef8a1
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Mon Feb 14 22:10:48 2011 +0200

    Drop the kdebluetooth transitional package. This was only for squeeze.
---
 debian/bluedevil.install |    1 -
 debian/changelog         |    2 ++
 debian/control           |    9 ---------
 debian/rules             |    7 -------
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/debian/bluedevil.install b/debian/bluedevil.install
deleted file mode 100644
index 097923b..0000000
--- a/debian/bluedevil.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/*
diff --git a/debian/changelog b/debian/changelog
index 46ee0aa..14913d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 bluedevil (1.0.2-0r1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop the kdebluetooth transitional package.
+    This was only for squeeze.
 
  -- George Kiagiadakis <kiagiadakis.george at gmail.com>  Mon, 14 Feb 2011 22:05:04 +0200
 
diff --git a/debian/control b/debian/control
index 1a14be9..3453af2 100644
--- a/debian/control
+++ b/debian/control
@@ -26,12 +26,3 @@ Description: The KDE bluetooth stack
     (disconnect devices, send files, configure, etc...)
   * A daemon to listen incoming petitions, for example to receive files
     or to introduce a requested PIN.
-
-Package: kdebluetooth
-Architecture: all
-Depends: bluedevil, ${misc:Depends}
-Description: dummy transition package for kdebluetooth to bluedevil
- This is a dummy package to help on the transition from kdebluetooth to
- bluedevil. You can safely remove it if you want.
- .
- It can also be removed from the Debian package once squeeze is released.
diff --git a/debian/rules b/debian/rules
index 524943a..f9cac87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,10 @@
 #!/usr/bin/make -f
 
-# add epoch 1 to the kdebluetooth package
-KDEBLUETOOTH_VERSION := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: /1:/')
-
 override_dh_auto_configure:
 	dh_auto_configure --buildsystem=kde -- \
 			-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
 			-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
 			-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
 
-override_dh_gencontrol:
-	dh_gencontrol -pkdebluetooth -- -v$(KDEBLUETOOTH_VERSION)
-	dh_gencontrol -pbluedevil
-
 %:
 	dh --parallel --with kde $@

-- 
bluedevil packaging