[maemo-commits] [maemo-commits] r9742 - in projects/haf/trunk/dbus-glib/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-02-08 11:56:10 +0200 (Thu, 08 Feb 2007)
New Revision: 9742

Removed:
   projects/haf/trunk/dbus-glib/debian/patches/10-possible-sardine-fix.patch
Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
   projects/haf/trunk/dbus-glib/debian/control
Log:
trying


Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2007-02-08 09:43:56 UTC (rev 9741)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2007-02-08 09:56:10 UTC (rev 9742)
@@ -1,3 +1,10 @@
+dbus-glib (0.72-osso4) experimental; urgency=low
+
+  * Trying to fix compilation problem in Sardine.
+    (added build dependency to gtk-doc-tools.)
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 08 Feb 2007 11:55:51 +0200
+
 dbus-glib (0.72-osso3) experimental; urgency=low
 
   * Trying to fix compilation problem in Sardine.

Modified: projects/haf/trunk/dbus-glib/debian/control
===================================================================
--- projects/haf/trunk/dbus-glib/debian/control	2007-02-08 09:43:56 UTC (rev 9741)
+++ projects/haf/trunk/dbus-glib/debian/control	2007-02-08 09:56:10 UTC (rev 9742)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
-Build-Depends: cdbs, debhelper, libglib2.0-dev, libdbus-1-dev (>= 0.91), libexpat-dev, doxygen
+Build-Depends: cdbs, debhelper, libglib2.0-dev, libdbus-1-dev (>= 0.91), libexpat-dev, doxygen, gtk-doc-tools
 Standards-Version: 3.7.2
 
 Package: libdbus-glib-1-dev

Deleted: projects/haf/trunk/dbus-glib/debian/patches/10-possible-sardine-fix.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/10-possible-sardine-fix.patch	2007-02-08 09:43:56 UTC (rev 9741)
+++ projects/haf/trunk/dbus-glib/debian/patches/10-possible-sardine-fix.patch	2007-02-08 09:56:10 UTC (rev 9742)
@@ -1,13 +0,0 @@
-diff -pur dbus-glib-0.72/configure.ac dbus-glib-0.72.new/configure.ac
---- dbus-glib-0.72/configure.ac	2006-10-25 23:53:55.000000000 +0300
-+++ dbus-glib-0.72.new/configure.ac	2007-02-08 11:30:58.990797032 +0200
-@@ -58,6 +58,9 @@ AC_ARG_ENABLE(gcov, AS_HELP_STRING([--en
- AC_ARG_WITH(xml, AS_HELP_STRING([--with-xml=[libxml/expat]],[XML library to use]))
- AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check]))
- 
-+AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-+AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-+
- dnl DBUS_BUILD_TESTS controls unit tests built in to .c files 
- dnl and also some stuff in the test/ subdir
- AM_CONDITIONAL(DBUS_BUILD_TESTS, test x$enable_tests = xyes)