[Pkg-utopia-commits] r382 - in packages/experimental/dbus/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-12-04 13:59:55 +0000 (Sun, 04 Dec 2005)
New Revision: 382

Removed:
   packages/experimental/dbus/debian/patches/dbus-make-libtool-safe.patch
Modified:
   packages/experimental/dbus/debian/changelog
Log:
dbus-make-libtool-safe isn\'t necessary anymore

Modified: packages/experimental/dbus/debian/changelog
===================================================================
--- packages/experimental/dbus/debian/changelog	2005-12-04 12:16:43 UTC (rev 381)
+++ packages/experimental/dbus/debian/changelog	2005-12-04 13:59:55 UTC (rev 382)
@@ -1,11 +1,13 @@
 dbus (0.60-1) experimental; urgency=low
 
-  * New upstream release 
+  * New upstream release
   * Sonames of libdbus-1, libdbus-glib-1 and libdbus-qt-1 was bumped to 2
   * debian/patches/dbus-reloadconfig-reply.patch
     + Removed. Merged upstream
+  * debian/patches/dbus-make-libtool-safe.patch
+    + Removed. Fixed upstream
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun,  4 Dec 2005 13:05:17 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun,  4 Dec 2005 14:59:01 +0100
 
 dbus (0.50-3) experimental; urgency=low
 

Deleted: packages/experimental/dbus/debian/patches/dbus-make-libtool-safe.patch
===================================================================
--- packages/experimental/dbus/debian/patches/dbus-make-libtool-safe.patch	2005-12-04 12:16:43 UTC (rev 381)
+++ packages/experimental/dbus/debian/patches/dbus-make-libtool-safe.patch	2005-12-04 13:59:55 UTC (rev 382)
@@ -1,87 +0,0 @@
---- glib/Makefile.in.orig	2005-08-09 09:51:35.000000000 +1000
-+++ glib/Makefile.in	2005-08-09 09:53:02.000000000 +1000
-@@ -971,7 +971,7 @@
- 
- 
- dbus-glib-error-switch.h: $(top_srcdir)/dbus/dbus-protocol.h make-dbus-glib-error-switch.sh
--	libtool --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
-+	$(LIBTOOL) --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
- 
- regenerate-built-sources:
- 	@GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
---- glib/examples/Makefile.am.orig	2005-08-09 10:09:36.000000000 +1000
-+++ glib/examples/Makefile.am	2005-08-09 10:09:57.000000000 +1000
-@@ -15,7 +15,7 @@
- BUILT_SOURCES = example-service-glue.h
- 
- example-service-glue.h: example-service.xml
--	libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
-+	$(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
- 
- 
- ## Makefile.am bits for another client/server pair
-@@ -31,7 +31,7 @@
- BUILT_SOURCES += example-signal-emitter-glue.h
- 
- example-signal-emitter-glue.h: example-signal-emitter.xml
--	libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
-+	$(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
- 
- CLEANFILES = $(BUILT_SOURCES)
- 
---- glib/examples/Makefile.in.orig	2005-08-09 10:09:39.000000000 +1000
-+++ glib/examples/Makefile.in	2005-08-09 10:10:18.000000000 +1000
-@@ -723,10 +723,10 @@
- 
- 
- example-service-glue.h: example-service.xml
--	libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
-+	$(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
- 
- example-signal-emitter-glue.h: example-signal-emitter.xml
--	libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
-+	$(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- glib/examples/statemachine/Makefile.am.orig	2005-08-09 10:10:45.000000000 +1000
-+++ glib/examples/statemachine/Makefile.am	2005-08-09 10:11:04.000000000 +1000
-@@ -19,10 +19,10 @@
- BUILT_SOURCES = statemachine-server-glue.h statemachine-glue.h
- 
- statemachine-server-glue.h: statemachine-server.xml
--	libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
-+	$(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
- 
- statemachine-glue.h: statemachine.xml
--	libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
-+	$(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
- 
- sm-marshal.c: Makefile sm-marshal.list
- 	@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@
---- glib/examples/statemachine/Makefile.in.orig	2005-08-09 10:10:43.000000000 +1000
-+++ glib/examples/statemachine/Makefile.in	2005-08-09 10:11:20.000000000 +1000
-@@ -595,10 +595,10 @@
- 
- 
- statemachine-server-glue.h: statemachine-server.xml
--	libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
-+	$(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
- 
- statemachine-glue.h: statemachine.xml
--	libtool --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
-+	$(LIBTOOL) --mode=execute $(top_builddir)/glib/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
- 
- sm-marshal.c: Makefile sm-marshal.list
- 	@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@
---- glib/Makefile.am.orig	2005-08-10 02:44:50.000000000 +1000
-+++ glib/Makefile.am	2005-08-09 09:52:04.000000000 +1000
-@@ -5,7 +5,7 @@
- lib_LTLIBRARIES=libdbus-glib-1.la
- 
- dbus-glib-error-switch.h: $(top_srcdir)/dbus/dbus-protocol.h make-dbus-glib-error-switch.sh
--	libtool --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
-+	$(LIBTOOL) --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
- 
- BUILT_SOURCES = dbus-glib-error-switch.h
-