[SCM] gmt branch, master, updated. upstream/4.5.5-39-g4ebccc4
The following commit has been merged in the master branch:
commit 5c7095a8194d2fdaa14d58db4d86a7066710dde2
Author: Francesco Paolo Lovergine fran...@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 fran...@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 000..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 sramac...@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
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gmt branch, master, updated. upstream/4.5.5-39-g4ebccc4
The following commit has been merged in the master branch:
commit 4ebccc453d31af2e65352ae15bc261a83b252ba8
Author: Francesco Paolo Lovergine fran...@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 fran...@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 sramac...@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.0 +0200
git/src/gmt.h 2013-06-26 12:18:55.0 +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.0 +0100
-+++ git/configure 2012-03-13 13:46:50.0 +0100
-@@ -11390,7 +11390,7 @@
+--- git.orig/configure 2013-06-26 12:15:23.0 +0200
git/configure 2013-06-26 12:16:56.0 +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
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gmt branch, master, updated. upstream/4.5.5-39-g4ebccc4
The following commit has been merged in the master branch: commit 07c45dad7f201f99b39e8b8d86e98b573d538c3c Merge: 5c7095a8194d2fdaa14d58db4d86a7066710dde2 627e2a19ced9253f1f34de4d44c9ab0a0bf6678d Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Jun 26 12:02:08 2013 +0200 Merge tag 'upstream/4.5.9' Upstream version 4.5.9 -- Generic Mapping Tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gmt branch, master, updated. upstream/4.5.5-39-g4ebccc4
The following commit has been merged in the master branch: commit f366da1ddcdc558dcb5ed3b6f200709fceba85d5 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Jun 26 12:07:48 2013 +0200 New upstream release note. diff --git a/debian/changelog b/debian/changelog index 4d7bceb..962d1f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gmt (4.5.7-3) unstable; urgency=low +gmt (4.5.9-1) 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. @@ -11,7 +11,10 @@ gmt (4.5.7-3) unstable; urgency=low * 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) + eglibc 2.17. +(closes: #701431) + * New upstream release. +(closes: #705022) -- Francesco Paolo Lovergine fran...@debian.org Fri, 16 Mar 2012 14:53:42 +0100 -- Generic Mapping Tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
