r3093 - in packages/mbsystem/trunk/debian: . patches

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2013-06-05 01:15:15 +0000 (Wed, 05 Jun 2013)
New Revision: 3093

Removed:
   packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
Modified:
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/patches/older_autoconf.patch
   packages/mbsystem/trunk/debian/patches/series
   packages/mbsystem/trunk/debian/patches/system_proj4.patch
Log:
drop patches merged upstream

Modified: packages/mbsystem/trunk/debian/changelog
===================================================================
--- packages/mbsystem/trunk/debian/changelog	2013-06-02 08:59:33 UTC (rev 3092)
+++ packages/mbsystem/trunk/debian/changelog	2013-06-05 01:15:15 UTC (rev 3093)
@@ -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

Deleted: packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
===================================================================
--- packages/mbsystem/trunk/debian/patches/mbview_makefile.patch	2013-06-02 08:59:33 UTC (rev 3092)
+++ packages/mbsystem/trunk/debian/patches/mbview_makefile.patch	2013-06-05 01:15:15 UTC (rev 3093)
@@ -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
- 

Modified: packages/mbsystem/trunk/debian/patches/older_autoconf.patch
===================================================================
--- packages/mbsystem/trunk/debian/patches/older_autoconf.patch	2013-06-02 08:59:33 UTC (rev 3092)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf.patch	2013-06-05 01:15:15 UTC (rev 3093)
@@ -16,12 +16,3 @@
  
  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])

Modified: packages/mbsystem/trunk/debian/patches/series
===================================================================
--- packages/mbsystem/trunk/debian/patches/series	2013-06-02 08:59:33 UTC (rev 3092)
+++ packages/mbsystem/trunk/debian/patches/series	2013-06-05 01:15:15 UTC (rev 3093)
@@ -1,4 +1,3 @@
 # patches to apply
 #older_autoconf.patch
-mbview_makefile.patch
 system_proj4.patch

Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch
===================================================================
--- packages/mbsystem/trunk/debian/patches/system_proj4.patch	2013-06-02 08:59:33 UTC (rev 3092)
+++ packages/mbsystem/trunk/debian/patches/system_proj4.patch	2013-06-05 01:15:15 UTC (rev 3093)
@@ -6,13 +6,13 @@
 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