r3084 - in packages/mbsystem/trunk/debian: . patches source

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2013-06-02 02:20:44 +0000 (Sun, 02 Jun 2013)
New Revision: 3084

Added:
   packages/mbsystem/trunk/debian/compat
   packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
   packages/mbsystem/trunk/debian/patches/older_autoconf.patch
   packages/mbsystem/trunk/debian/source/
   packages/mbsystem/trunk/debian/source/format
Removed:
   packages/mbsystem/trunk/debian/patches/mbview_makefile
   packages/mbsystem/trunk/debian/patches/older_autoconf
Modified:
   packages/mbsystem/trunk/debian/patches/series
Log:
fixes to patching

Added: packages/mbsystem/trunk/debian/compat
===================================================================
--- packages/mbsystem/trunk/debian/compat	                        (rev 0)
+++ packages/mbsystem/trunk/debian/compat	2013-06-02 02:20:44 UTC (rev 3084)
@@ -0,0 +1 @@
+8

Deleted: packages/mbsystem/trunk/debian/patches/mbview_makefile
===================================================================
--- packages/mbsystem/trunk/debian/patches/mbview_makefile	2013-06-02 01:48:43 UTC (rev 3083)
+++ packages/mbsystem/trunk/debian/patches/mbview_makefile	2013-06-02 02:20:44 UTC (rev 3084)
@@ -1,12 +0,0 @@
-Index: src/mbview/Makefile.am
-===================================================================
---- src/mbview/Makefile.am	(revision 2083)
-+++ src/mbview/Makefile.am	(working copy)
-@@ -1,6 +1,6 @@
- bin_PROGRAMS = mbgrdviz mbeditviz
- 
--AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@
-+AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@ @GMT_INC_DIR@
- LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@
- 
- include_HEADERS = mbview.h

Copied: packages/mbsystem/trunk/debian/patches/mbview_makefile.patch (from rev 3083, packages/mbsystem/trunk/debian/patches/mbview_makefile)
===================================================================
--- packages/mbsystem/trunk/debian/patches/mbview_makefile.patch	                        (rev 0)
+++ packages/mbsystem/trunk/debian/patches/mbview_makefile.patch	2013-06-02 02:20:44 UTC (rev 3084)
@@ -0,0 +1,18 @@
+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,6 +1,6 @@
+ bin_PROGRAMS = mbgrdviz mbeditviz
+ 
+-AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@
++AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@ @GMT_INC_DIR@
+ LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@
+ 
+ include_HEADERS = mbview.h

Deleted: packages/mbsystem/trunk/debian/patches/older_autoconf
===================================================================
--- packages/mbsystem/trunk/debian/patches/older_autoconf	2013-06-02 01:48:43 UTC (rev 3083)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf	2013-06-02 02:20:44 UTC (rev 3084)
@@ -1,12 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 2083)
-+++ configure.in	(working copy)
-@@ -1,6 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
- dnl configure.in for mbsystem
--AC_PREREQ([2.69])
-+AC_PREREQ([2.67])
- 
- dnl Disable configure caching
- define([AC_CACHE_LOAD], )

Copied: packages/mbsystem/trunk/debian/patches/older_autoconf.patch (from rev 3083, packages/mbsystem/trunk/debian/patches/older_autoconf)
===================================================================
--- packages/mbsystem/trunk/debian/patches/older_autoconf.patch	                        (rev 0)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf.patch	2013-06-02 02:20:44 UTC (rev 3084)
@@ -0,0 +1,18 @@
+Last-Update: 2013-06-02
+Author: Hamish Bowman <hamish_b yahoo.com>
+Applied-Upstream: no
+Forwarded: yes
+Bug-MC: 
+Description: Allow build to continue on Squeeze
+
+
+--- a/configure.in	(revision 2083)
++++ b/configure.in	(working copy)
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ dnl configure.in for mbsystem
+-AC_PREREQ([2.69])
++AC_PREREQ([2.67])
+ 
+ dnl Disable configure caching
+ define([AC_CACHE_LOAD], )

Modified: packages/mbsystem/trunk/debian/patches/series
===================================================================
--- packages/mbsystem/trunk/debian/patches/series	2013-06-02 01:48:43 UTC (rev 3083)
+++ packages/mbsystem/trunk/debian/patches/series	2013-06-02 02:20:44 UTC (rev 3084)
@@ -1,3 +1,3 @@
 # patches to apply
-older_autoconf
-mbview_makefile
+older_autoconf.patch
+mbview_makefile.patch

Added: packages/mbsystem/trunk/debian/source/format
===================================================================
--- packages/mbsystem/trunk/debian/source/format	                        (rev 0)
+++ packages/mbsystem/trunk/debian/source/format	2013-06-02 02:20:44 UTC (rev 3084)
@@ -0,0 +1 @@
+3.0 (quilt)