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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-02-27 17:31:04 +0000 (Mon, 27 Feb 2006)
New Revision: 666

Modified:
   packages/unstable/dbus/debian/changelog
   packages/unstable/dbus/debian/patches/dbus-qt-buildfix.patch
Log:
  + Added. Fix compilation of the Qt bindings (from CVS)

Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2006-02-27 13:43:26 UTC (rev 665)
+++ packages/unstable/dbus/debian/changelog	2006-02-27 17:31:04 UTC (rev 666)
@@ -13,7 +13,7 @@
   * Let binary-predeb/libdbus-1-cil:: depend on
     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.
+    + Added. Fix compilation of the Qt bindings (from CVS)
   * debian/patches/dbus-update-automake.patch
     + Added. Fix compilation of the Qt bindings.
 

Modified: packages/unstable/dbus/debian/patches/dbus-qt-buildfix.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-qt-buildfix.patch	2006-02-27 13:43:26 UTC (rev 665)
+++ packages/unstable/dbus/debian/patches/dbus-qt-buildfix.patch	2006-02-27 17:31:04 UTC (rev 666)
@@ -2,9 +2,10 @@
 ===================================================================
 RCS file: /cvs/dbus/dbus/qt/Makefile.am,v
 retrieving revision 1.14
-diff -u -r1.14 Makefile.am
+retrieving revision 1.15
+diff -u -r1.14 -r1.15
 --- qt/Makefile.am	17 Feb 2006 00:04:38 -0000	1.14
-+++ qt/Makefile.am	24 Feb 2006 21:22:31 -0000
++++ qt/Makefile.am	25 Feb 2006 19:54:56 -0000	1.15
 @@ -58,9 +58,9 @@
  	$(top_srcdir)/qt/qdbusxmlparser_p.h     
  
@@ -18,33 +19,57 @@
  
  CLEANFILES=qdbusabstractadaptor.moc qdbusserver.moc qdbusconnection.moc
  
-Index: qt/qdbustype.h
+Index: dbus/Makefile.am
 ===================================================================
-RCS file: /cvs/dbus/dbus/qt/qdbustype.h,v
-retrieving revision 1.1
-diff -u -r1.1 qdbustype.h
---- qt/qdbustype.h	15 Feb 2006 16:25:12 -0000	1.1
-+++ qt/qdbustype.h	24 Feb 2006 21:22:31 -0000
-@@ -31,6 +31,7 @@
- #include <QtCore/qlist.h>
- #include "qdbusmacros.h"
- #include <dbus/dbus.h>
-+#include <dbus/dbus-signature.h>
+RCS file: /cvs/dbus/dbus/dbus/Makefile.am,v
+retrieving revision 1.73
+retrieving revision 1.74
+diff -u -r1.73 -r1.74
+--- dbus/Makefile.am	23 Sep 2005 16:24:36 -0000	1.73
++++ dbus/Makefile.am	25 Feb 2006 18:34:12 -0000	1.74
+@@ -37,6 +37,7 @@
+ 	dbus-protocol.h				\
+ 	dbus-server.h				\
+ 	dbus-shared.h				\
++	dbus-signature.h			\
+ 	dbus-threads.h				\
+ 	dbus-types.h				\
+ 	$(GLIB_INCLUDES)			\
+@@ -84,7 +85,6 @@
+ 	dbus-sha.c				\
+ 	dbus-sha.h				\
+ 	dbus-signature.c			\
+-	dbus-signature.h			\
+ 	dbus-timeout.c				\
+ 	dbus-timeout.h				\
+ 	dbus-threads-internal.h			\
+Index: dbus/dbus-signature.h
+===================================================================
+RCS file: /cvs/dbus/dbus/dbus/dbus-signature.h,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- dbus/dbus-signature.h	11 May 2005 18:07:22 -0000	1.3
++++ dbus/dbus-signature.h	25 Feb 2006 18:34:12 -0000	1.4
+@@ -71,4 +71,4 @@
  
- // forward declaration
- class QDBusTypeList;
-Index: qt/qdbusutil.cpp
+ DBUS_END_DECLS
+ 
+-#endif /* DBUS_MESSAGE_H */
++#endif /* DBUS_SIGNATURE_H */
+Index: dbus/dbus.h
 ===================================================================
-RCS file: /cvs/dbus/dbus/qt/qdbusutil.cpp,v
-retrieving revision 1.1
-diff -u -r1.1 qdbusutil.cpp
---- qt/qdbusutil.cpp	15 Feb 2006 16:25:12 -0000	1.1
-+++ qt/qdbusutil.cpp	24 Feb 2006 21:22:31 -0000
-@@ -24,6 +24,7 @@
- #include "qdbusutil.h"
- 
- #include <dbus/dbus.h>
+RCS file: /cvs/dbus/dbus/dbus/dbus.h,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- dbus/dbus.h	21 Jan 2005 05:06:10 -0000	1.20
++++ dbus/dbus.h	25 Feb 2006 18:34:12 -0000	1.21
+@@ -41,6 +41,7 @@
+ #include <dbus/dbus-protocol.h>
+ #include <dbus/dbus-server.h>
+ #include <dbus/dbus-shared.h>
 +#include <dbus/dbus-signature.h>
+ #include <dbus/dbus-threads.h>
+ #include <dbus/dbus-types.h>
  
- #include <QtCore/qstringlist.h>
- #include <QtCore/qregexp.h>