[Pkg-bluetooth-commits] r1246 - in /packages/obexd/trunk/debian: changelog control

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Thu Jan 10 10:07:11 2013
New Revision: 1246

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1246
Log:
Remove obex-data-server from Conflicts field. (Closes: #695013, #565318)

Modified:
    packages/obexd/trunk/debian/changelog
    packages/obexd/trunk/debian/control

Modified: packages/obexd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/obexd/trunk/debian/changelog?rev=1246&op=diff
==============================================================================
--- packages/obexd/trunk/debian/changelog (original)
+++ packages/obexd/trunk/debian/changelog Thu Jan 10 10:07:11 2013
@@ -1,3 +1,12 @@
+obexd (0.47-2) experimental; urgency=low
+
+  * Update debian/control.
+	- Remove obex-data-server from Conflicts field. (Closes: #695013, #565318)
+      Version 0.47 changed the D-Bus namespace to use org.bluez.obex
+      instead of org.openobex.
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Thu, 10 Jan 2013 19:17:00 +0900
+
 obexd (0.47-1) experimental; urgency=low
 
   * New upstream release.

Modified: packages/obexd/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/obexd/trunk/debian/control?rev=1246&op=diff
==============================================================================
--- packages/obexd/trunk/debian/control (original)
+++ packages/obexd/trunk/debian/control Thu Jan 10 10:07:11 2013
@@ -31,7 +31,6 @@
 Package: obexd-server
 Section: admin
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: obex-data-server
 Architecture: any
 Description: D-Bus OBEX server
  Implementation of OBEX(OBject EXchange) client and server as a D-Bus service