[mbsystem] 15/39: drop patches merged upstream

[Andreas Tille]

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

tille pushed a commit to branch master
in repository mbsystem.

commit 11315aa427b2092efc96eba55270e893f2707e3a
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Wed Jun 5 01:15:15 2013 +0000

    drop patches merged upstream
---
 debian/changelog                     |  2 +-
 debian/patches/mbview_makefile.patch | 20 --------------------
 debian/patches/older_autoconf.patch  |  9 ---------
 debian/patches/series                |  1 -
 debian/patches/system_proj4.patch    |  4 ++--
 5 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e9e055..29b568f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mbsystem (5.4.2083-0) UNRELEASED; urgency=low
+mbsystem (5.4.2097-0) UNRELEASED; urgency=low
 
   * Initial packaging incorporating upstream support for shared libs
   * Split off -dev, -doc, -data packages
diff --git a/debian/patches/mbview_makefile.patch b/debian/patches/mbview_makefile.patch
deleted file mode 100644
index 066ca79..0000000
--- a/debian/patches/mbview_makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Last-Update: 2013-06-02
-Author: Hamish Bowman <hamish_b yahoo.com>
-Applied-Upstream: no
-Forwarded: yes
-Bug-MC:
-Description: Add missing GMT includes dir
-
-
---- a/src/mbview/Makefile.am	(revision 2083)
-+++ b/src/mbview/Makefile.am	(working copy)
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = mbgrdviz mbeditviz
- 
--AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@
--LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@
-+AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@ @GMT_INC_DIR@
-+LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@ ${libgmt_LIBS}
- 
- include_HEADERS = mbview.h
- 
diff --git a/debian/patches/older_autoconf.patch b/debian/patches/older_autoconf.patch
index 923b871..4f66799 100644
--- a/debian/patches/older_autoconf.patch
+++ b/debian/patches/older_autoconf.patch
@@ -16,12 +16,3 @@ Description: Allow build to continue on Squeeze
  
  dnl Disable configure caching
  define([AC_CACHE_LOAD], )
-@@ -191,7 +191,7 @@
- dnl Package check failed so check manually
- if test "$GOT_GMT" = "no" ; then
- 
--libgmt_LIBS="-lgmt"
-+libgmt_LIBS="-lgmt -lgmtps -lpsl"
- dnl arg for command line
- AC_ARG_WITH(gmt-lib, [  --with-gmt-lib=DIR	Location of GMT library],
- 	[libgmt_CFLAGS="-L${withval}"] [GOT_GMT=yes], [GOT_GMT=no])
diff --git a/debian/patches/series b/debian/patches/series
index 11cefb9..c1b629c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 # patches to apply
 #older_autoconf.patch
-mbview_makefile.patch
 system_proj4.patch
diff --git a/debian/patches/system_proj4.patch b/debian/patches/system_proj4.patch
index 0033851..45e34ba 100644
--- a/debian/patches/system_proj4.patch
+++ b/debian/patches/system_proj4.patch
@@ -6,13 +6,13 @@ Bug-MC:
 Description: Use Debian's PROJ.4 programs instead of bundled ones
 
 
---- a/src/proj/Makefile.am	(revision 2083)
+--- a/src/proj/Makefile.am	(revision 2097)
 +++ b/src/proj/Makefile.am	(working copy)
 @@ -1,14 +1,14 @@
 -bin_PROGRAMS = proj geod
 +#bin_PROGRAMS = proj geod
  
- AM_CPPFLAGS = -I..
+ AM_CPPFLAGS = -I at top_srcdir@/src
  
  include_HEADERS = proj_api.h 
  

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