[arch-commits] Commit in obex-data-server/repos (3 files)

[Andrea Scarpino]

    Date: Tuesday, January 27, 2009 @ 14:02:06
  Author: andrea
Revision: 25713

Merged revisions 25712 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/obex-data-server/trunk

........
  r25712 | andrea | 2009-01-27 20:01:45 +0100 (Tue, 27 Jan 2009) | 1 line
  
  upgpkg: obex-data-server 0.4.2-1
........

Modified:
  obex-data-server/repos/testing-i686/	(properties)
  obex-data-server/repos/testing-i686/PKGBUILD
Deleted:
  obex-data-server/repos/testing-i686/obex-data-server-0.3.4-bluez4.patch

-------------------------------------+
 PKGBUILD                            |   16 +++++++---------
 obex-data-server-0.3.4-bluez4.patch |   25 -------------------------
 2 files changed, 7 insertions(+), 34 deletions(-)


Property changes on: obex-data-server/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /obex-data-server/trunk:1-12495
   + /obex-data-server/trunk:1-25712

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-01-27 19:01:45 UTC (rev 25712)
+++ testing-i686/PKGBUILD	2009-01-27 19:02:06 UTC (rev 25713)
@@ -1,23 +1,21 @@
 # $Id$
-# Maintainer: Roman Kyrylych <roman at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Roman Kyrylych <roman at archlinux.org>
 # Contributor: Keerthi <keerthi.linux at gmail.com>
 
 pkgname=obex-data-server
-pkgver=0.3.4
+pkgver=0.4.2
 pkgrel=1
-pkgdesc="obex-data-server is D-Bus service providing high-level OBEX client and server side functionality."
+pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality."
 arch=('i686' 'x86_64')
 url="http://wiki.muiline.com/obex-data-server"
 license=('GPL')
-depends=('dbus-glib>=0.76' 'bluez>=4.1' 'openobex>=1.3-3')
-source=(http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz
-	obex-data-server-0.3.4-bluez4.patch)
-md5sums=('5c71d24e8d471cc294d9d47a8f8de971'
-         '0ffcebc3a1dde3e6b5670f4003b847c7')
+depends=('dbus-glib>=0.76' 'bluez>=4.1' 'openobex>=1.3-3' 'imagemagick')
+source=(http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz)
+md5sums=('b91594e2df8135291e2a9958ef88683f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/obex-data-server-0.3.4-bluez4.patch" || return 1
   ./configure --prefix=/usr --enable-system-config --sysconfdir=/etc || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Deleted: testing-i686/obex-data-server-0.3.4-bluez4.patch
===================================================================
--- testing-i686/obex-data-server-0.3.4-bluez4.patch	2009-01-27 19:01:45 UTC (rev 25712)
+++ testing-i686/obex-data-server-0.3.4-bluez4.patch	2009-01-27 19:02:06 UTC (rev 25713)
@@ -1,25 +0,0 @@
---- obex-data-server-0.3.4.old/src/ods-bluez.c	2008-06-27 16:21:14.000000000 +0100
-+++ obex-data-server-0.3.4/src/ods-bluez.c	2008-09-12 18:17:27.000000000 +0100
-@@ -121,11 +121,11 @@ ods_bluez_init (OdsBluez *bluez)
- 	
- 	bluez->priv->manager_proxy = dbus_g_proxy_new_for_name (klass->connection,
- 															"org.bluez", 
--															"/org/bluez", 
-+															"/", 
- 															"org.bluez.Manager");
- 	if (!dbus_g_proxy_call (bluez->priv->manager_proxy, "DefaultAdapter", &error, 
- 								G_TYPE_INVALID,
--								G_TYPE_STRING, &adapter_object, 
-+								DBUS_TYPE_G_OBJECT_PATH, &adapter_object,
- 								G_TYPE_INVALID)) {
- 		g_warning("Unable to connect to dbus: %s", error->message);
- 		g_clear_error (&error);
-@@ -314,7 +314,7 @@ get_remote_service_record_cb (DBusGProxy
- 		goto err;
- 	}
- 	
--	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, &scanned);
-+	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, record_array->len, &scanned);
- 	
- 	/* get channel for this service */
- 	if (sdp_get_access_protos (sdp_record, &protos) != 0) {