[Pkg-utopia-commits] r668 - packages/unstable/dbus/debian/patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-02-27 21:30:25 +0000 (Mon, 27 Feb 2006)
New Revision: 668

Modified:
   packages/unstable/dbus/debian/patches/dbus-qt-buildfix.patch
Log:
Another update

Modified: packages/unstable/dbus/debian/patches/dbus-qt-buildfix.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-qt-buildfix.patch	2006-02-27 20:50:19 UTC (rev 667)
+++ packages/unstable/dbus/debian/patches/dbus-qt-buildfix.patch	2006-02-27 21:30:25 UTC (rev 668)
@@ -2,14 +2,84 @@
 ===================================================================
 RCS file: /cvs/dbus/dbus/qt/Makefile.am,v
 retrieving revision 1.14
-retrieving revision 1.15
-diff -u -r1.14 -r1.15
+diff -u -r1.14 Makefile.am
 --- qt/Makefile.am	17 Feb 2006 00:04:38 -0000	1.14
-+++ qt/Makefile.am	25 Feb 2006 19:54:56 -0000	1.15
-@@ -58,9 +58,9 @@
- 	$(top_srcdir)/qt/qdbusxmlparser_p.h     
++++ qt/Makefile.am	27 Feb 2006 21:29:53 -0000
+@@ -21,46 +21,46 @@
+ 	qdbusabstractadaptor.h
  
+ libdbus_qt4_1_la_SOURCES = 			\
+-	$(top_srcdir)/qt/qdbusconnection.cpp    \
+-	$(top_srcdir)/qt/qdbuserror.cpp         \
+-	$(top_srcdir)/qt/qdbusintegrator.cpp    \
+-	$(top_srcdir)/qt/qdbusmarshall.cpp      \
+-	$(top_srcdir)/qt/qdbusmessage.cpp       \
+-	$(top_srcdir)/qt/qdbusserver.cpp        \
+-	$(top_srcdir)/qt/qdbustype.cpp          \
+-	$(top_srcdir)/qt/qdbusobject.cpp        \
+-	$(top_srcdir)/qt/qdbusinterface.cpp     \
+-	$(top_srcdir)/qt/qdbusstandardinterfaces.cpp	\
+-	$(top_srcdir)/qt/qdbusxmlparser.cpp     \
+-	$(top_srcdir)/qt/qdbusutil.cpp          \
+-	$(top_srcdir)/qt/qdbusintrospection.cpp \
+-	$(top_srcdir)/qt/qdbusabstractadaptor.cpp	\
+-	$(top_srcdir)/qt/qdbusthread.cpp        \
++	qdbusconnection.cpp    \
++	qdbuserror.cpp         \
++	qdbusintegrator.cpp    \
++	qdbusmarshall.cpp      \
++	qdbusmessage.cpp       \
++	qdbusserver.cpp        \
++	qdbustype.cpp          \
++	qdbusobject.cpp        \
++	qdbusinterface.cpp     \
++	qdbusstandardinterfaces.cpp	\
++	qdbusxmlparser.cpp     \
++	qdbusutil.cpp          \
++	qdbusintrospection.cpp \
++	qdbusabstractadaptor.cpp	\
++	qdbusthread.cpp        \
+ 						\
+-	$(top_srcdir)/dbus/qdbus.h              \
+-	$(top_srcdir)/qt/qdbusabstractadaptor.h \
+-	$(top_srcdir)/qt/qdbusconnection.h      \
+-	$(top_srcdir)/qt/qdbusconnection_p.h    \
+-	$(top_srcdir)/qt/qdbuserror.h           \
+-	$(top_srcdir)/qt/qdbusinterface.h       \
+-	$(top_srcdir)/qt/qdbusinterface_p.h     \
+-	$(top_srcdir)/qt/qdbusintrospection.h   \
+-	$(top_srcdir)/qt/qdbusmacros.h          \
+-	$(top_srcdir)/qt/qdbusmarshall.h        \
+-	$(top_srcdir)/qt/qdbusmessage.h         \
+-	$(top_srcdir)/qt/qdbusmessage_p.h       \
+-	$(top_srcdir)/qt/qdbusobject.h          \
+-	$(top_srcdir)/qt/qdbusobject_p.h        \
+-	$(top_srcdir)/qt/qdbusserver.h          \
+-	$(top_srcdir)/qt/qdbusstandardinterfaces.h \
+-	$(top_srcdir)/qt/qdbustype.h            \
+-	$(top_srcdir)/qt/qdbusvariant.h		\
+-	$(top_srcdir)/qt/qdbusxmlparser_p.h     
++	qdbus.h              \
++	qdbusabstractadaptor.h \
++	qdbusconnection.h      \
++	qdbusconnection_p.h    \
++	qdbuserror.h           \
++	qdbusinterface.h       \
++	qdbusinterface_p.h     \
++	qdbusintrospection.h   \
++	qdbusmacros.h          \
++	qdbusmarshall.h        \
++	qdbusmessage.h         \
++	qdbusmessage_p.h       \
++	qdbusobject.h          \
++	qdbusobject_p.h        \
++	qdbusserver.h          \
++	qdbusstandardinterfaces.h \
++	qdbustype.h            \
++	qdbusvariant.h		\
++	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