eggdbus: clean up patches

Based on a patch by Robert Schwebel <r.schwebel@pengutronix.de>

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 55 insertions, 50 deletions

diff --git a/patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff b/patches/eggdbus-0.6/0001-make-eggdbus-crosscompile-aware.patch
index 615af6be1..0c7f08021 100644
--- a/patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff
+++ b/patches/eggdbus-0.6/0001-make-eggdbus-crosscompile-aware.patch
@@ -1,5 +1,6 @@
-Subject: [patch] make eggdbus crosscompile aware
 From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:14:59 +0200
+Subject: [PATCH] make eggdbus crosscompile aware
 
 The build system compiles tools like eggdbus-glib-genmarshal and
 eggdbus-binding-tool; if you cross compile the package, these fines are
@@ -9,17 +10,16 @@ Makefile tries to run the cross compiled binaries then.
 Make it possible to overwrite them from the configure command line.
 
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
 ---
  configure.ac            |   10 ++++++++++
  src/eggdbus/Makefile.am |    2 +-
- 2 files changed, 11 insertions(+), 1 deletion(-)
+ 2 files changed, 11 insertions(+), 1 deletions(-)
 
-Index: eggdbus-0.6/configure.ac
-===================================================================
---- eggdbus-0.6.orig/configure.ac
-+++ eggdbus-0.6/configure.ac
-@@ -34,6 +34,16 @@ AM_CONDITIONAL(MAN_PAGES_ENABLED, test x
+diff --git a/configure.ac b/configure.ac
+index 497cb7f..a4e792a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,6 +34,16 @@ AM_CONDITIONAL(MAN_PAGES_ENABLED, test x$enable_man_pages = xyes)
  
  GTK_DOC_CHECK([1.3])
  
@@ -36,10 +36,10 @@ Index: eggdbus-0.6/configure.ac
  #### gcc warning flags
  
  if test "x$GCC" = "xyes"; then
-Index: eggdbus-0.6/src/eggdbus/Makefile.am
-===================================================================
---- eggdbus-0.6.orig/src/eggdbus/Makefile.am
-+++ eggdbus-0.6/src/eggdbus/Makefile.am
+diff --git a/src/eggdbus/Makefile.am b/src/eggdbus/Makefile.am
+index aebb984..95615cd 100644
+--- a/src/eggdbus/Makefile.am
++++ b/src/eggdbus/Makefile.am
 @@ -130,7 +130,7 @@ BUILT_SOURCES =								\
  	$(NULL)
  
diff --git a/patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff b/patches/eggdbus-0.6/0002-build-tests-only-when-not-cross-compiling.patch
index 2ef52ba85..6bde37d6d 100644
--- a/patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff
+++ b/patches/eggdbus-0.6/0002-build-tests-only-when-not-cross-compiling.patch
@@ -1,5 +1,6 @@
-Subject: [patch] build tests only when not cross compiling
 From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:14:59 +0200
+Subject: [PATCH] build tests only when not cross compiling
 
 When building the tests, the makefiles try to run
 eggdbus-glib-genmarshal and eggdbus-binding-tool, but this doesn't
@@ -8,14 +9,13 @@ really make any sense when cross compiling.
 The patch below disables the tests completely when cross compiling.
 
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
 ---
  configure.ac    |    2 ++
  src/Makefile.am |    8 +++++++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
+ 2 files changed, 9 insertions(+), 1 deletions(-)
 
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index a4e792a..0f31dea 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -44,6 +44,8 @@ AC_ARG_WITH(eggdbus-tools,
@@ -27,8 +27,8 @@ Index: b/configure.ac
  #### gcc warning flags
  
  if test "x$GCC" = "xyes"; then
-Index: b/src/Makefile.am
-===================================================================
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 60fb584..cec7e43 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -1,5 +1,11 @@
diff --git a/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff b/patches/eggdbus-0.6/0003-update-autotoolization.patch
index 2cc89973e..8909fb4b0 100644
--- a/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff
+++ b/patches/eggdbus-0.6/0003-update-autotoolization.patch
@@ -1,5 +1,6 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: update autotoolization
+Date: Sat, 29 Oct 2011 19:14:59 +0200
+Subject: [PATCH] update autotoolization
 
 This patch updates the autotool-infrastructure for recent tools.
 
@@ -13,8 +14,20 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  src/tests/Makefile.am    |    2 +-
  6 files changed, 14 insertions(+), 11 deletions(-)
 
-Index: b/configure.ac
-===================================================================
+diff --git a/Makefile.am b/Makefile.am
+index c1f1470..9ab8648 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ SUBDIRS = src docs
+ 
+ NULL =
+diff --git a/configure.ac b/configure.ac
+index 0f31dea..5ad85af 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1,16 +1,16 @@
@@ -57,8 +70,8 @@ Index: b/configure.ac
  
  dnl ==========================================================================
  echo "
-Index: b/docs/eggdbus/Makefile.am
-===================================================================
+diff --git a/docs/eggdbus/Makefile.am b/docs/eggdbus/Makefile.am
+index 94c00bf..e30e6c3 100644
 --- a/docs/eggdbus/Makefile.am
 +++ b/docs/eggdbus/Makefile.am
 @@ -34,7 +34,7 @@ IGNORE_HFILES= 			\
@@ -70,8 +83,8 @@ Index: b/docs/eggdbus/Makefile.am
  	$(DBUS_GLIB_CFLAGS)						\
  	$(GLIB_CFLAGS)							\
  	$(GIO_CFLAGS)							\
-Index: b/docs/tests/Makefile.am
-===================================================================
+diff --git a/docs/tests/Makefile.am b/docs/tests/Makefile.am
+index 5f7940c..3ba5cba 100644
 --- a/docs/tests/Makefile.am
 +++ b/docs/tests/Makefile.am
 @@ -29,7 +29,7 @@ IGNORE_HFILES= 			\
@@ -83,8 +96,8 @@ Index: b/docs/tests/Makefile.am
  	$(DBUS_GLIB_CFLAGS)						\
  	$(GLIB_CFLAGS)							\
  	$(GIO_CFLAGS)							\
-Index: b/src/eggdbus/Makefile.am
-===================================================================
+diff --git a/src/eggdbus/Makefile.am b/src/eggdbus/Makefile.am
+index 95615cd..0f96181 100644
 --- a/src/eggdbus/Makefile.am
 +++ b/src/eggdbus/Makefile.am
 @@ -1,7 +1,7 @@
@@ -96,8 +109,8 @@ Index: b/src/eggdbus/Makefile.am
  	-I$(top_builddir)/src                           		\
  	-I$(top_srcdir)/src                             		\
  	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\"       		\
-Index: b/src/tests/Makefile.am
-===================================================================
+diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
+index 7bc1b24..71a3e82 100644
 --- a/src/tests/Makefile.am
 +++ b/src/tests/Makefile.am
 @@ -1,7 +1,7 @@
@@ -109,15 +122,3 @@ Index: b/src/tests/Makefile.am
  	-I$(top_builddir)/src                           		\
  	-I$(top_srcdir)/src                             		\
  	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\"       		\
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- 
-+ACLOCAL_AMFLAGS = -I m4
-+
- SUBDIRS = src docs
- 
- NULL =
diff --git a/patches/eggdbus-0.6/eggdbus-0.6-fix-deps.diff b/patches/eggdbus-0.6/0004-fix-dependencies.patch
index dfd69984e..69ec54f57 100644
--- a/patches/eggdbus-0.6/eggdbus-0.6-fix-deps.diff
+++ b/patches/eggdbus-0.6/0004-fix-dependencies.patch
@@ -1,15 +1,16 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: fix dependencies
+Date: Sat, 29 Oct 2011 19:14:59 +0200
+Subject: [PATCH] fix dependencies
 
 sone source files of eggdbus-binding-tool need eggdbusenumtypes.h
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
  src/eggdbus/Makefile.am |    2 ++
- 1 file changed, 2 insertions(+)
+ 1 files changed, 2 insertions(+), 0 deletions(-)
 
-Index: b/src/eggdbus/Makefile.am
-===================================================================
+diff --git a/src/eggdbus/Makefile.am b/src/eggdbus/Makefile.am
+index 0f96181..ab0269d 100644
 --- a/src/eggdbus/Makefile.am
 +++ b/src/eggdbus/Makefile.am
 @@ -81,6 +81,8 @@ eggdbus_binding_tool_SOURCES = 						\
diff --git a/patches/eggdbus-0.6/series b/patches/eggdbus-0.6/series
index 7c070413a..b1632e07e 100644
--- a/patches/eggdbus-0.6/series
+++ b/patches/eggdbus-0.6/series
@@ -1,4 +1,7 @@
-eggdbus-0.6-host-tools.diff
-eggdbus-0.6-no-tests.diff
-eggdbus-0.6-autotools.diff
-eggdbus-0.6-fix-deps.diff
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-make-eggdbus-crosscompile-aware.patch
+0002-build-tests-only-when-not-cross-compiling.patch
+0003-update-autotoolization.patch
+0004-fix-dependencies.patch
+# c6f978adda750662ff12fae35ed8df6d  - git-ptx-patches magic