[Pkg-utopia-commits] r658 - in packages/unstable/dbus/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-02-24 21:40:50 +0000 (Fri, 24 Feb 2006)
New Revision: 658

Added:
   packages/unstable/dbus/debian/patches/dbus-update-automake.patch
Modified:
   packages/unstable/dbus/debian/changelog
   packages/unstable/dbus/debian/rules
Log:
* debian/patches/dbus-update-automake.patch
  + Added. Fix compilation of the Qt bindings.

Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2006-02-24 21:22:54 UTC (rev 657)
+++ packages/unstable/dbus/debian/changelog	2006-02-24 21:40:50 UTC (rev 658)
@@ -14,6 +14,8 @@
     common-binary-post-install-arch, so dh_clideps can do it's work correctly.
   * debian/patches/dbus-qt-buildfix.patch 
     + Added. Fix compilation of the Qt bindings.
+  * debian/patches/dbus-update-automake.patch
+    + Added. Fix compilation of the Qt bindings.
 
  -- Sjoerd Simons <sjoerd at debian.org>  Fri, 24 Feb 2006 22:09:17 +0100
 

Added: packages/unstable/dbus/debian/patches/dbus-update-automake.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-update-automake.patch	2006-02-24 21:22:54 UTC (rev 657)
+++ packages/unstable/dbus/debian/patches/dbus-update-automake.patch	2006-02-24 21:40:50 UTC (rev 658)
@@ -0,0 +1,16 @@
+diff -ur dbus-0.61.orig/qt/Makefile.am dbus-0.61/qt/Makefile.am
+--- dbus-0.61.orig/qt/Makefile.am	2006-02-24 22:33:32.000000000 +0100
++++ dbus-0.61/qt/Makefile.am	2006-02-24 22:35:37.000000000 +0100
+@@ -58,9 +58,9 @@
+ 	$(top_srcdir)/qt/qdbusxmlparser_p.h     
+ 
+ 
+-$(top_srcdir)/qt/qdbusabstractadaptor.lo: qdbusabstractadaptor.moc
+-$(top_srcdir)/qt/qdbusserver.lo: qdbusserver.moc
+-$(top_srcdir)/qt/qdbusconnection.lo: qdbusconnection_p.moc
++qdbusabstractadaptor.lo: qdbusabstractadaptor.moc
++qdbusserver.lo: qdbusserver.moc
++qdbusconnection.lo: qdbusconnection_p.moc
+ 
+ CLEANFILES=qdbusabstractadaptor.moc qdbusserver.moc qdbusconnection.moc
+ 

Modified: packages/unstable/dbus/debian/rules
===================================================================
--- packages/unstable/dbus/debian/rules	2006-02-24 21:22:54 UTC (rev 657)
+++ packages/unstable/dbus/debian/rules	2006-02-24 21:40:50 UTC (rev 658)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 # Copyright © 2002,2003 Colin Walters <walters at verbum.org>
 # Copyright © 2003 Daniel Stone <daniels at debian.org>
+DEB_AUTO_UPDATE_AUTOCONF="yes"
 
 binary/libdbus-glib-1-2:: binary/libdbus-1-2
 binary/libdbus-qt-1-1c2:: binary/libdbus-1-2
@@ -14,6 +15,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+
 ifeq ($(DEB_BUILD_ARCH),powerpc)
  MONO_FLAGS=--enable-mono --enable-mono-docs
 endif
@@ -46,7 +48,7 @@
 
 export MONO_SHARED_DIR=$(CURDIR)
 
-binary-predeb/libdbus-1-cil:: common-binary-post-install-arch
+binary-predeb/libdbus-1-cil:: binary-arch
 	dh_makeclilibs -V
 	dh_clideps