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

Francesco Paolo Lovergine frankie at debian.org
Mon Nov 25 14:52:34 UTC 2013


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

    Added patch for eglibc

diff --git a/debian/changelog b/debian/changelog
index bd67ab6..4d7bceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gmt (4.5.7-3) UNRELEASED; urgency=low
+gmt (4.5.7-3) unstable; urgency=low
 
   * Added Octave support and an ad-hoc new package for that.
   * Added octave-gmt package for supporting grid files in GNU octave.
@@ -9,6 +9,9 @@ gmt (4.5.7-3) UNRELEASED; urgency=low
       - Added ${misc:Depends} to all pkgs.
   * Revised for Suggestions.
   * Fixed previous changelog for layout and contents.
+  * ACK of previous NMUi by Sebastian Ramacher:
+  	* debian/patches/eglibc-2.17.patch: Add missing include to fix FTBFS with
+      eglibc 2.17. (Closes: #701431)
 
  -- 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
new file mode 100644
index 0000000..5af09ed
--- /dev/null
+++ b/debian/patches/eglibc-2.17.patch
@@ -0,0 +1,15 @@
+Description: Add missing include to fix FBTFS with eglibc 2.17
+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" {
+ #include "gmt_notunix.h"	/* Stuff for Windows, OS/2 etc */
+ #ifndef WIN32
+ #include <pwd.h>
++#include <sys/types.h>
+ #include <unistd.h>
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 86009cb..58061fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 # no current patches
 kfreebsd
 bashism
+eglibc-2.17.patch

-- 
Generic Mapping Tools



More information about the Pkg-grass-devel mailing list