[gmt] 04/06: Drop m68k-support.patch, applied upstream. Refresh manpage-section.patch.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gmt.

commit 9d690634de20a61fbe11f08e550282e9a9436124
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jun 27 00:28:33 2017 +0200

    Drop m68k-support.patch, applied upstream. Refresh manpage-section.patch.
---
 debian/changelog                     |  2 ++
 debian/patches/m68k-support.patch    | 21 ---------------------
 debian/patches/manpage-section.patch |  4 +++-
 debian/patches/series                |  1 -
 4 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f60768..f732ab5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gmt (5.4.2+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop m68k-support.patch, applied upstream.
+    Refresh manpage-section.patch.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 27 Jun 2017 00:24:31 +0200
 
diff --git a/debian/patches/m68k-support.patch b/debian/patches/m68k-support.patch
deleted file mode 100644
index 8fb0f51..0000000
--- a/debian/patches/m68k-support.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Add support for m68k.
- This patch adds support for m68k by defining the correct
- macro to determine the instruction pointer from ucontext.
- .
-Author: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
-Bug-Debian: https://bugs.debian.org/865726
-Forwarded: http://gmt.soest.hawaii.edu/issues/1122
-Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/18449
-Last-Update: 2017-06-24
-
---- a/src/common_sighandler.c
-+++ b/src/common_sighandler.c
-@@ -83,6 +83,8 @@ void backtrace_symbols_fd(void *const *b
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.arm_pc)
- # elif defined( __hppa__)
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.sc_iaoq[0])
-+# elif defined(__m68k__)
-+#  define UC_IP(uc) ((void *) (uc)->uc_mcontext.gregs[R_PC])
- # elif defined(__s390__)
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.psw.addr)
- # elif defined(__sparc__)
diff --git a/debian/patches/manpage-section.patch b/debian/patches/manpage-section.patch
index e272798..6d90caf 100644
--- a/debian/patches/manpage-section.patch
+++ b/debian/patches/manpage-section.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/doc/rst/conf.py.in
 +++ b/doc/rst/conf.py.in
-@@ -232,143 +232,143 @@ latex_elements = {
+@@ -232,144 +232,144 @@ latex_elements = {
  # One entry per manual page. List of tuples
  # (source start file, name, description, authors, manual section).
  man_pages = [
@@ -104,6 +104,7 @@ Forwarded: not-needed
 -('supplements/meca/pscoupe', 'pscoupe', 'Plot cross-sections of focal mechanisms', '', 1),
 -('supplements/meca/psmeca', 'psmeca', 'Plot focal mechanisms on maps', '', 1),
 -('supplements/meca/pspolar', 'pspolar', 'Plot polarities on the inferior focal half-sphere on maps', '', 1),
+-('supplements/meca/pssac', 'pssac', 'Plot seismograms in SAC format on maps', '', 1),
 -('supplements/meca/psvelo', 'psvelo', 'Plot velocity vectors, crosses, and wedges on maps', '', 1),
 -('supplements/mgd77/mgd77convert', 'mgd77convert', 'Convert MGD77 data to other file formats', '', 1),
 -('supplements/mgd77/mgd77header', 'mgd77header', 'Create MGD77 headers from A77 files', '', 1),
@@ -241,6 +242,7 @@ Forwarded: not-needed
 +('supplements/meca/pscoupe', 'pscoupe', 'Plot cross-sections of focal mechanisms', '', '1gmt'),
 +('supplements/meca/psmeca', 'psmeca', 'Plot focal mechanisms on maps', '', '1gmt'),
 +('supplements/meca/pspolar', 'pspolar', 'Plot polarities on the inferior focal half-sphere on maps', '', '1gmt'),
++('supplements/meca/pssac', 'pssac', 'Plot seismograms in SAC format on maps', '', '1gmt'),
 +('supplements/meca/psvelo', 'psvelo', 'Plot velocity vectors, crosses, and wedges on maps', '', '1gmt'),
 +('supplements/mgd77/mgd77convert', 'mgd77convert', 'Convert MGD77 data to other file formats', '', '1gmt'),
 +('supplements/mgd77/mgd77header', 'mgd77header', 'Create MGD77 headers from A77 files', '', '1gmt'),
diff --git a/debian/patches/series b/debian/patches/series
index 6ec2ec9..65bf2b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 disable-triangle.patch
 manpage-section.patch
-m68k-support.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gmt.git