[maemo-commits] [maemo-commits] r16649 - in projects/connectivity/osso-obc/trunk: . debian src

[From: subversion at stage.maemo.org]

Author: jh
Date: 2008-11-13 13:24:08 +0200 (Thu, 13 Nov 2008)
New Revision: 16649

Modified:
   projects/connectivity/osso-obc/trunk/Makefile.am
   projects/connectivity/osso-obc/trunk/configure.ac
   projects/connectivity/osso-obc/trunk/debian/changelog
   projects/connectivity/osso-obc/trunk/debian/control
   projects/connectivity/osso-obc/trunk/debian/rules
   projects/connectivity/osso-obc/trunk/src/fl.c
Log:
Preparation for 0.12

Modified: projects/connectivity/osso-obc/trunk/Makefile.am
===================================================================
--- projects/connectivity/osso-obc/trunk/Makefile.am	2008-11-13 10:44:09 UTC (rev 16648)
+++ projects/connectivity/osso-obc/trunk/Makefile.am	2008-11-13 11:24:08 UTC (rev 16649)
@@ -7,9 +7,7 @@
 		       config.guess config.sub acinclude.m4 aclocal.m4 \
 		       build-stamp
 
-EXTRA_DIST =                        \
-	aclocal/compile_warnings.m4 \
-	autogen.sh
+EXTRA_DIST = aclocal/compile_warnings.m4
 
 distclean-local:
 	$(RM) $(srcdir)/osso-obc-*.tar.gz

Modified: projects/connectivity/osso-obc/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-obc/trunk/configure.ac	2008-11-13 10:44:09 UTC (rev 16648)
+++ projects/connectivity/osso-obc/trunk/configure.ac	2008-11-13 11:24:08 UTC (rev 16649)
@@ -1,4 +1,4 @@
-AC_INIT([osso-obc],[0.11])
+AC_INIT([osso-obc],[0.12])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: projects/connectivity/osso-obc/trunk/debian/changelog
===================================================================
--- projects/connectivity/osso-obc/trunk/debian/changelog	2008-11-13 10:44:09 UTC (rev 16648)
+++ projects/connectivity/osso-obc/trunk/debian/changelog	2008-11-13 11:24:08 UTC (rev 16649)
@@ -1,3 +1,11 @@
+osso-obc (0.12) unstable; urgency=low
+
+  * Remove osso-gwconnect dependency
+  * Add support for specifying mime-type in put requests
+  * Add hack to work around the pkg-config configure error
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Thu, 13 Nov 2008 13:21:08 +0200
+
 osso-obc (0.11) unstable; urgency=low
 
   * Update licensing info. Fixes: NB#69515

Modified: projects/connectivity/osso-obc/trunk/debian/control
===================================================================
--- projects/connectivity/osso-obc/trunk/debian/control	2008-11-13 10:44:09 UTC (rev 16648)
+++ projects/connectivity/osso-obc/trunk/debian/control	2008-11-13 11:24:08 UTC (rev 16649)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Johan Hedberg <johan.hedberg at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, libdbus-1-dev, libdbus-glib-1-dev, libxml2-dev, libgconf2-dev, osso-gwconnect-dev, libbluetooth2-dev, libgwobex-dev (>= 0.42), libreadline4-dev | libreadline5-dev
+Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, libdbus-1-dev, libdbus-glib-1-dev, libxml2-dev, libgconf2-dev, libbluetooth3-dev, libgwobex-dev (>= 0.42), libreadline4-dev | libreadline5-dev
 Standards-Version: 3.6.1.0
 
 Package: osso-obc

Modified: projects/connectivity/osso-obc/trunk/debian/rules
===================================================================
--- projects/connectivity/osso-obc/trunk/debian/rules	2008-11-13 10:44:09 UTC (rev 16648)
+++ projects/connectivity/osso-obc/trunk/debian/rules	2008-11-13 11:24:08 UTC (rev 16649)
@@ -9,8 +9,6 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-confflags += --enable-btcond
-
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
         INSTALL_PROGRAM += -s
 endif
@@ -27,7 +25,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	./configure $(confflags) \
+	PKG_CONFIG=/usr/bin/pkg-config ./configure $(confflags) \
 		--prefix=/usr
 
 	touch configure-stamp

Modified: projects/connectivity/osso-obc/trunk/src/fl.c
===================================================================
--- projects/connectivity/osso-obc/trunk/src/fl.c	2008-11-13 10:44:09 UTC (rev 16648)
+++ projects/connectivity/osso-obc/trunk/src/fl.c	2008-11-13 11:24:08 UTC (rev 16649)
@@ -187,6 +187,7 @@
     return l;
 }
 
+#if 0
 static void print_element_names(xmlNode * a_node)
 {
     xmlNode *cur_node = NULL;
@@ -217,6 +218,7 @@
         print_element_names(cur_node->children);
     }
 }
+#endif
 
 static xmlDocPtr parse_fl_xml(const gchar *buf, gint len)
 {