gpsd: clean up patches

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

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

7 files changed, 48 insertions, 53 deletions

diff --git a/patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff b/patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch
index b487ea5f0..e3e166be3 100644
--- a/patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
+++ b/patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch
@@ -1,4 +1,5 @@
 From: Luotao Fu <l.fu@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:33:40 +0100
 Subject: [PATCH] fix core compiling with nmea disabled
 
 struct nmea is only defined in the driver union if NMEA_ENABLED is set.
@@ -8,14 +9,13 @@ NMEA_ENABLE to fix this.
 
 Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
 ---
-
-[20110222 wsa: fixed in master meanwhile]
+# 20110222 wsa: fixed in master meanwhile
 
  libgpsd_core.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/libgpsd_core.c b/libgpsd_core.c
-index 8220eae..71dd5ba 100644
+index 28f787d..4109369 100644
 --- a/libgpsd_core.c
 +++ b/libgpsd_core.c
 @@ -206,7 +206,7 @@ static /*@null@*/void *gpsd_ppsmonitor(void *arg)
@@ -27,6 +27,3 @@ index 8220eae..71dd5ba 100644
  		  && session->driver.nmea.ignore_trailing_edge
  #endif /* GPSCLOCK_ENABLE */
  		  ) {
--- 
-1.6.2.1
-
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff b/patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
index 5e832a24a..b39161ec1 100644
--- a/patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
+++ b/patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
@@ -1,4 +1,3 @@
-From dbc28fc8a50f47329ce7e579e35629318f95bf4b Mon Sep 17 00:00:00 2001
 From: Luotao Fu <l.fu@pengutronix.de>
 Date: Thu, 23 Apr 2009 18:18:54 +0200
 Subject: [PATCH] fix link breakage if some drivers are not enabled
@@ -12,17 +11,16 @@ I only did this quick hack. Better ideas are highly welcome.
 
 Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
 ---
-
-[20110222 wsa: fixed in master meanwhile. Like this.]
+# 20110222 wsa: fixed in master meanwhile. Like this.
 
  gpsdecode.c |    6 ++++++
- 1 file changed, 6 insertions(+)
+ 1 files changed, 6 insertions(+), 0 deletions(-)
 
-Index: gpsd-2.39/gpsdecode.c
-===================================================================
---- gpsd-2.39/gpsdecode.c.orig
-+++ gpsd-2.39/gpsdecode.c
-@@ -57,19 +57,25 @@ static void decode(FILE *fpin, FILE *fpo
+diff --git a/gpsdecode.c b/gpsdecode.c
+index ffe898b..e18c698 100644
+--- a/gpsdecode.c
++++ b/gpsdecode.c
+@@ -57,19 +57,25 @@ static void decode(FILE *fpin, FILE *fpout)
  	else if (lexer.type == COMMENT_PACKET)
  	    continue;
  	else if (lexer.type == RTCM2_PACKET) {
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff b/patches/gpsd-2.39/0003-fix-a-simple-compile-error.patch
index 4438e8442..312102d75 100644
--- a/patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff
+++ b/patches/gpsd-2.39/0003-fix-a-simple-compile-error.patch
@@ -1,4 +1,5 @@
 From: Juergen Beisert <jbeisert@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:33:40 +0100
 Subject: [PATCH] fix a simple compile error
 
 This fixes the following compile error:
@@ -6,19 +7,17 @@ This fixes the following compile error:
 .libs/drivers.o drivers.c:938: error: expected '}' before ';' token
 
 Signed-off-by: Juergen Beisert <jbeisert@pengutronix.de>
-
 ---
-
-[20110222 wsa: fixed in master meanwhile]
+# 20110222 wsa: fixed in master meanwhile
 
  drivers.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
-Index: gpsd-2.39/drivers.c
-===================================================================
---- gpsd-2.39/drivers.c.orig
-+++ gpsd-2.39/drivers.c
-@@ -935,7 +935,7 @@ static gps_mask_t garmintxt_parse_input(
+diff --git a/drivers.c b/drivers.c
+index 89cd772..373476f 100644
+--- a/drivers.c
++++ b/drivers.c
+@@ -935,7 +935,7 @@ static gps_mask_t garmintxt_parse_input(struct gps_device_t *session)
  
  static const struct gps_type_t garmintxt = {
      .type_name     = "Garmin Simple Text",		/* full name of type */
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff b/patches/gpsd-2.39/0004-Fix-autotool-bug.patch
index 4a144e09e..d1054186f 100644
--- a/patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff
+++ b/patches/gpsd-2.39/0004-Fix-autotool-bug.patch
@@ -13,17 +13,15 @@ python check condition, which cause that these will be failed to be set if
 python is not enabled.
 
 Signed-off-by: FIXME
-
 ---
-
-[20110222 wsa: fixed in master meanwhile]
+# 20110222 wsa: fixed in master meanwhile
 
  configure.ac |   21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
+ 1 files changed, 21 insertions(+), 0 deletions(-)
 
-Index: configure.ac
-===================================================================
---- a/configure.ac.orig
+diff --git a/configure.ac b/configure.ac
+index 7db2a6c..67e9253 100644
+--- a/configure.ac
 +++ b/configure.ac
 @@ -5,6 +5,27 @@ dnl AC_PREFIX_PROGRAM(gcc)
  AM_CONFIG_HEADER(gpsd_config.h)
diff --git a/patches/gpsd-2.39/gpsd-2.39-configure_ac-fix-python.diff b/patches/gpsd-2.39/0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch
index 121093e60..648146116 100644
--- a/patches/gpsd-2.39/gpsd-2.39-configure_ac-fix-python.diff
+++ b/patches/gpsd-2.39/0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch
@@ -1,19 +1,19 @@
 From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: just rely on AM_PATH_PYTHON to work propperly
+Date: Sun, 30 Oct 2011 22:33:40 +0100
+Subject: [PATCH] just rely on AM_PATH_PYTHON to work propperly
 
 remove hand crafted python detection and detection of
 PYTHON_LIBS and PYTHON_CFLAGS, they are not used anyway.
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
 ---
- configure.ac |   77 +++--------------------------------------------------------
- 1 file changed, 5 insertions(+), 72 deletions(-)
+ configure.ac |   77 ++++------------------------------------------------------
+ 1 files changed, 5 insertions(+), 72 deletions(-)
 
-Index: gpsd-2.39/configure.ac
-===================================================================
---- gpsd-2.39.orig/configure.ac
-+++ gpsd-2.39/configure.ac
+diff --git a/configure.ac b/configure.ac
+index 67e9253..08f99a8 100644
+--- a/configure.ac
++++ b/configure.ac
 @@ -27,82 +27,15 @@ ACREQUIRE_BUGFIX
  # ACREQUIRE_BUGFIX done
  
@@ -50,7 +50,7 @@ Index: gpsd-2.39/configure.ac
 -		fi
 -		if test "x$ac_python" = "xyes"; then
 -			AC_MSG_RESULT(yes)
- 
+-
 -			PYTHON_CFLAGS="-DHAVE_PYTHON -I$PYTHON_PREFIX/include/python$PYTHON_VERSION"
 -
 -			OLD_CPPFLAGS="$CPPFLAGS"
@@ -63,7 +63,7 @@ Index: gpsd-2.39/configure.ac
 -					[AC_MSG_WARN([*** Python include files not found! You should install the Python development package. Python support disabled]); ac_python=no])
 -			CPPFLAGS="$OLD_CPPFLAGS"
 -			CXXFLAGS="$OLD_CXXFLAGS"
--
+ 
 -			if test "x$ac_python" = "xyes"; then
 -				AC_SUBST([PYTHON_CFLAGS])
 -
diff --git a/patches/gpsd-2.39/gpsd-2.39-fixup-parallel-build-for-python.diff b/patches/gpsd-2.39/0006-fix-parallel-build.patch
index 02d74251d..1ee26f2c0 100644
--- a/patches/gpsd-2.39/gpsd-2.39-fixup-parallel-build-for-python.diff
+++ b/patches/gpsd-2.39/0006-fix-parallel-build.patch
@@ -1,4 +1,5 @@
 From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:33:40 +0100
 Subject: [PATCH] fix parallel build
 
 The build system has a race with the creation of the python bindings; if
@@ -7,15 +8,14 @@ same time, the build "sometimes" breaks; this can be triggered with only
 a few cycles when built with -j16 on a 8-way box.
 
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
 ---
  Makefile.am |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ 1 files changed, 7 insertions(+), 2 deletions(-)
 
-Index: gpsd-2.39/Makefile.am
-===================================================================
---- gpsd-2.39.orig/Makefile.am
-+++ gpsd-2.39/Makefile.am
+diff --git a/Makefile.am b/Makefile.am
+index 05e31f0..818c57a 100644
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -187,12 +187,17 @@ if HAVE_PYTHON
  PYEXTENSIONS = gpspacket.so gpslib.so
  noinst_SCRIPTS = gpspacket.so gpslib.so setup.py
diff --git a/patches/gpsd-2.39/series b/patches/gpsd-2.39/series
index 0340e8dc7..4c18748c4 100644
--- a/patches/gpsd-2.39/series
+++ b/patches/gpsd-2.39/series
@@ -1,6 +1,9 @@
-gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
-gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
-gpsd-2.39-fix_build_error.diff
-gpsd-2.39-fix-autotool-bug.diff
-gpsd-2.39-configure_ac-fix-python.diff
-gpsd-2.39-fixup-parallel-build-for-python.diff
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fix-core-compiling-with-nmea-disabled.patch
+0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
+0003-fix-a-simple-compile-error.patch
+0004-Fix-autotool-bug.patch
+0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch
+0006-fix-parallel-build.patch
+# 78d23d82a5e7a26d3f088a02c22c703d  - git-ptx-patches magic