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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-02-08 11:02:06 +0200 (Thu, 08 Feb 2007)
New Revision: 9736

Removed:
   projects/haf/trunk/dbus-glib/debian/patches/06-allow-older-automake.patch
Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
   projects/haf/trunk/dbus-glib/debian/rules
Log:
trying to fix compilation in Sardine


Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2007-02-08 08:53:42 UTC (rev 9735)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2007-02-08 09:02:06 UTC (rev 9736)
@@ -1,9 +1,9 @@
 dbus-glib (0.72-osso2) experimental; urgency=low
 
-  * UNRELEASED
+  * Trying to fix compilation problem in Sardine.
   * Added support for compiling with thumb instructions.
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 29 Nov 2006 12:59:47 +0200
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 08 Feb 2007 11:01:41 +0200
 
 dbus-glib (0.72-osso1) experimental; urgency=low
 

Deleted: projects/haf/trunk/dbus-glib/debian/patches/06-allow-older-automake.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/06-allow-older-automake.patch	2007-02-08 08:53:42 UTC (rev 9735)
+++ projects/haf/trunk/dbus-glib/debian/patches/06-allow-older-automake.patch	2007-02-08 09:02:06 UTC (rev 9736)
@@ -1,11 +0,0 @@
---- dbus-glib-0.72/configure.ac	2006-10-25 23:53:55.000000000 +0300
-+++ dbus-glib-0.72.new/configure.ac	2006-11-14 17:44:28.107921704 +0200
-@@ -5,7 +5,7 @@
- 
- AC_CANONICAL_TARGET
- 
--AM_INIT_AUTOMAKE([1.9])
-+AM_INIT_AUTOMAKE([1.8])
- 
- AM_CONFIG_HEADER(config.h)
- 

Modified: projects/haf/trunk/dbus-glib/debian/rules
===================================================================
--- projects/haf/trunk/dbus-glib/debian/rules	2007-02-08 08:53:42 UTC (rev 9735)
+++ projects/haf/trunk/dbus-glib/debian/rules	2007-02-08 09:02:06 UTC (rev 9736)
@@ -23,8 +23,8 @@
 DEB_DH_STRIP_ARGS := --dbg-package=libdbus-glib-1-2
 
 # this is needed because we patch Makefile.ams in the tarball
-makebuilddir/libdbus-glib-1-doc::
-	cd $(DEB_BUILDDIR); autoreconf
+makebuilddir/libdbus-glib-1-2::
+	cd $(DEB_BUILDDIR); AUTOMAKE=automake-1.9 ACLOCAL=aclocal-1.9 autoreconf
 
 common-configure-impl::
 	cp $(CURDIR)/debian/dbus-bus-introspect.xml $(DEB_BUILDDIR)/tools/