diff -pruN 0.56-3/bluez.conf 0.56-3ubuntu1/bluez.conf
--- 0.56-3/bluez.conf 2008-08-06 22:23:40.000000000 +0100
+++ 0.56-3ubuntu1/bluez.conf 2010-01-30 11:30:44.000000000 +0000
@@ -11,18 +11,12 @@
-
-
-
-
-
-
diff -pruN 0.56-3/debian/changelog 0.56-3ubuntu1/debian/changelog
--- 0.56-3/debian/changelog 2009-12-23 12:50:00.000000000 +0000
+++ 0.56-3ubuntu1/debian/changelog 2010-01-30 09:29:03.000000000 +0000
@@ -1,3 +1,14 @@
+gpe-bluetooth (0.56-3ubuntu1) lucid; urgency=low
+
+ * Merge from Debian testing, remaining changes:
+ - debian/patches/dbus-policy:
+ + send_path without send_destination applies to all services, since the
+ destination is already allowed, this line is unnecessary.
+ + receive_sender is only necessary for signals (method replies and
+ errors are already allowed), and neither service emits signals.
+
+ -- Ilya Barygin Sat, 30 Jan 2010 12:28:52 +0300
+
gpe-bluetooth (0.56-3) unstable; urgency=low
* Add vcs tags for collab-maint
@@ -9,6 +20,17 @@ gpe-bluetooth (0.56-3) unstable; urgency
-- Neil Williams Wed, 23 Dec 2009 12:49:59 +0000
+gpe-bluetooth (0.56-2ubuntu1) karmic; urgency=low
+
+ * Merge from debian unstable (LP: #392675), remaining changes:
+ - debian/patches/000-dbus-policy.patch:
+ + send_path without send_destination applies to all services, since the
+ destination is already allowed, this line is unnecessary.
+ + receive_sender is only necessary for signals (method replies and
+ errors are already allowed), and neither service emits signals.
+
+ -- Andres Rodriguez Fri, 26 Jun 2009 14:10:04 -0500
+
gpe-bluetooth (0.56-2) unstable; urgency=low
* build-depend on intltool instead of just the perl module
@@ -23,6 +45,28 @@ gpe-bluetooth (0.56-1) unstable; urgency
-- Neil Williams Sun, 15 Mar 2009 11:08:33 +0000
+gpe-bluetooth (0.55-3ubuntu1) jaunty; urgency=low
+
+ * debian/patches/000-dbus-policy.patch: LP: #318762.
+ - send_path without send_destination applies to all services, since the
+ destination is already allowed, this line is unnecessary
+ - receive_sender is only necessary for signals (method replies and
+ errors are already allowed), and neither service emits signals
+
+ -- Scott James Remnant Tue, 09 Dec 2008 17:06:14 -0800
+
+gpe-bluetooth (0.55-3build2) intrepid; urgency=low
+
+ * No-change rebuild for libbluetooth2 -> libbluetooth3 transistion.
+
+ -- Steve Kowalik Wed, 08 Oct 2008 12:56:51 +1100
+
+gpe-bluetooth (0.55-3build1) hardy; urgency=low
+
+ * Rebuild for libmimedir-gnome0.3 -> libmimedir-gnome0.4 transistion.
+
+ -- Steve Kowalik Mon, 24 Dec 2007 17:14:17 +1100
+
gpe-bluetooth (0.55-3) unstable; urgency=low
* Add GPE team to Uploaders
diff -pruN 0.56-3/debian/control 0.56-3ubuntu1/debian/control
--- 0.56-3/debian/control 2009-12-07 23:57:23.000000000 +0000
+++ 0.56-3ubuntu1/debian/control 2010-01-30 08:43:58.000000000 +0000
@@ -1,7 +1,8 @@
Source: gpe-bluetooth
Section: utils
Priority: optional
-Maintainer: Neil Williams
+Maintainer: Ubuntu Developers
+XSBC-Original-Maintainer: Neil Williams
Uploaders: Debian GPE team ,
Moray Allan ,
Phil Blundell ,
diff -pruN 0.56-3/debian/patches/dbus-policy 0.56-3ubuntu1/debian/patches/dbus-policy
--- 0.56-3/debian/patches/dbus-policy 1970-01-01 01:00:00.000000000 +0100
+++ 0.56-3ubuntu1/debian/patches/dbus-policy 2010-01-30 09:27:46.000000000 +0000
@@ -0,0 +1,30 @@
+Description: The shipped D-Bus policy (in bluez.conf) is wrong:
+ * send_path without send_destination allows for all services,
+ since the destination is allowed anyway, this line is unnecessary
+ * receive_sender is only necessary for signals (method replies and
+ errors are already allowed), and neither service emits signals
+Author: Scott James Remnant
+Bug-Ubuntu: https://launchpad.net/bugs/318762
+
+diff -Nur -x '*.orig' -x '*~' gpe-bluetooth-0.55/bluez.conf gpe-bluetooth-0.55.new/bluez.conf
+--- gpe-bluetooth-0.55/bluez.conf 2006-10-11 15:42:24.000000000 -0700
++++ gpe-bluetooth-0.55.new/bluez.conf 2008-12-09 17:06:09.000000000 -0800
+@@ -11,18 +11,12 @@
+
+
+
+-
+-
+-
+
+
+
+
+
+
+-
+-
+-
+
+
+
diff -pruN 0.56-3/debian/patches/.dpkg-source-applied 0.56-3ubuntu1/debian/patches/.dpkg-source-applied
--- 0.56-3/debian/patches/.dpkg-source-applied 2010-01-30 11:32:27.000000000 +0000
+++ 0.56-3ubuntu1/debian/patches/.dpkg-source-applied 2010-01-30 11:30:44.000000000 +0000
@@ -1,2 +1,3 @@
desktop-validity
hciconfig-path
+dbus-policy
diff -pruN 0.56-3/debian/patches/series 0.56-3ubuntu1/debian/patches/series
--- 0.56-3/debian/patches/series 2009-12-20 11:04:01.000000000 +0000
+++ 0.56-3ubuntu1/debian/patches/series 2010-01-30 09:24:43.000000000 +0000
@@ -1,2 +1,3 @@
desktop-validity
hciconfig-path
+dbus-policy
diff -pruN 0.56-3/.pc/applied-patches 0.56-3ubuntu1/.pc/applied-patches
--- 0.56-3/.pc/applied-patches 2010-01-30 11:32:27.000000000 +0000
+++ 0.56-3ubuntu1/.pc/applied-patches 2010-01-30 11:30:44.000000000 +0000
@@ -1,2 +1,3 @@
desktop-validity
hciconfig-path
+dbus-policy
diff -pruN 0.56-3/.pc/dbus-policy/bluez.conf 0.56-3ubuntu1/.pc/dbus-policy/bluez.conf
--- 0.56-3/.pc/dbus-policy/bluez.conf 1970-01-01 01:00:00.000000000 +0100
+++ 0.56-3ubuntu1/.pc/dbus-policy/bluez.conf 2008-08-06 22:23:40.000000000 +0100
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+