[SCM] gmt branch, master, updated. upstream/4.5.5-39-g4ebccc4

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 4ebccc453d31af2e65352ae15bc261a83b252ba8
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Jun 26 12:19:13 2013 +0200

    Patch refreshed.

diff --git a/debian/changelog b/debian/changelog
index 962d1f2..14ff2f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ gmt (4.5.9-1) unstable; urgency=low
     (closes: #701431)
   * New upstream release. 
     (closes: #705022)
+  * Patch kfreebsd refreshed to include hurd case instead.
+    (closes: #676147)
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 16 Mar 2012 14:53:42 +0100
 
diff --git a/debian/patches/eglibc-2.17.patch b/debian/patches/eglibc-2.17.patch
index 5af09ed..0338cc8 100644
--- a/debian/patches/eglibc-2.17.patch
+++ b/debian/patches/eglibc-2.17.patch
@@ -3,9 +3,11 @@ Author: Sebastian Ramacher <sramacher at debian.org>
 Bug-Debian: http://bugs.debian.org/701431
 Last-Update: 2013-06-24
 
---- gmt-4.5.7.orig/src/gmt.h
-+++ gmt-4.5.7/src/gmt.h
-@@ -86,6 +86,7 @@ extern "C" {
+Index: git/src/gmt.h
+===================================================================
+--- git.orig/src/gmt.h	2013-06-26 12:18:55.000000000 +0200
++++ git/src/gmt.h	2013-06-26 12:18:55.000000000 +0200
+@@ -88,6 +88,7 @@
  #include "gmt_notunix.h"	/* Stuff for Windows, OS/2 etc */
  #ifndef WIN32
  #include <pwd.h>
diff --git a/debian/patches/kfreebsd b/debian/patches/kfreebsd
index e84b755..0c48bc5 100644
--- a/debian/patches/kfreebsd
+++ b/debian/patches/kfreebsd
@@ -1,13 +1,13 @@
 Index: git/configure
 ===================================================================
---- git.orig/configure	2012-03-07 10:02:52.000000000 +0100
-+++ git/configure	2012-03-13 13:46:50.000000000 +0100
-@@ -11390,7 +11390,7 @@
+--- git.orig/configure	2013-06-26 12:15:23.000000000 +0200
++++ git/configure	2013-06-26 12:16:56.000000000 +0200
+@@ -7420,7 +7420,7 @@
  		else				# Solaris
  			LD_OPT="-G"
  		fi
--	elif test "$os" = "Linux" ; then	# Need optimization when doing shared
-+	elif test "$os" = "Linux" || test "$os" = "GNU/kFreeBSD"; then	# Need optimization when doing shared
+-	elif test "$os" = "Linux" || test "$os" = "GNU/kFreeBSD" ; then	# Need optimization when doing shared
++	elif test "$os" = "Linux" || test "$os" = "GNU/kFreeBSD" || test "$os" = "GNU"; then	# Need optimization when doing shared
  		LD='$(CC)'
  		SL_VERSION=$SL.$LIB_MAJOR_VERSION
  		LD_OPT='-shared -Wl,-soname=$*.'$SL_VERSION

-- 
Generic Mapping Tools