[DebianGIS-dev] r2650 - in packages/mbsystem/trunk/debian: . patches

hamish-guest at alioth.debian.org hamish-guest at alioth.debian.org
Fri Jan 1 08:38:11 UTC 2010 

Author: hamish-guest
Date: 2010-01-01 08:38:11 +0000 (Fri, 01 Jan 2010)
New Revision: 2650

Removed:
   packages/mbsystem/trunk/debian/patches/mbps_c_gmt431.dpatch
Modified:
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/control
   packages/mbsystem/trunk/debian/copyright
   packages/mbsystem/trunk/debian/patches/00list
   packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch
Log:
update for new 5.1.2-final release

Modified: packages/mbsystem/trunk/debian/changelog
===================================================================
--- packages/mbsystem/trunk/debian/changelog	2009-12-27 10:13:55 UTC (rev 2649)
+++ packages/mbsystem/trunk/debian/changelog	2010-01-01 08:38:11 UTC (rev 2650)
@@ -1,5 +1,6 @@
-mbsystem (5.1.2beta11-0) UNRELEASED; urgency=low
+mbsystem (5.1.2-0) UNRELEASED; urgency=low
 
   * Initial packaging
+  * Update for new 5.1.2 release
 
- -- Hamish Bowman <hamish_b yahoo com>  Sat, 29 Aug 2009 14:24:12 +1200
+ -- Hamish Bowman <hamish_b yahoo.com>  Fri,  1 Jan 2010 21:17:28 +1300

Modified: packages/mbsystem/trunk/debian/control
===================================================================
--- packages/mbsystem/trunk/debian/control	2009-12-27 10:13:55 UTC (rev 2649)
+++ packages/mbsystem/trunk/debian/control	2010-01-01 08:38:11 UTC (rev 2650)
@@ -3,15 +3,17 @@
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: 
-Build-depends: libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev, libgl1-mesa-dev
+Build-depends: libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev,
+  libgl1-mesa-dev, libfftw3-dev, libproj-dev
 Standards-Version: 
 Homepage: http://www.ldeo.columbia.edu/res/pi/MB-System/
 
 Package: mbsystem
 Section: science
 Architecture: any
-Depends: ${shlibs:Depends}, gmt, lesstif2, libnetcdf4, libgl1-mesa-glx, libglu1-mesa
-Suggests: ghostscript, xv
+Depends: ${shlibs:Depends}, gmt, lesstif2, libnetcdf4, libgl1-mesa-glx,
+  libglu1-mesa, libfftw3-3, libproj0
+Suggests: ghostscript, proj-bin, xv
 Recommends: 
 Description: Processing tools for multibeam and sidescan sonar data
  MB-System is an open source software package for the processing and

Modified: packages/mbsystem/trunk/debian/copyright
===================================================================
--- packages/mbsystem/trunk/debian/copyright	2009-12-27 10:13:55 UTC (rev 2649)
+++ packages/mbsystem/trunk/debian/copyright	2010-01-01 08:38:11 UTC (rev 2650)
@@ -1,4 +1,4 @@
-GPL 2
+GPL 3
 
 http://www.ldeo.columbia.edu/res/pi/MB-System/html/gpl.html
 

Modified: packages/mbsystem/trunk/debian/patches/00list
===================================================================
--- packages/mbsystem/trunk/debian/patches/00list	2009-12-27 10:13:55 UTC (rev 2649)
+++ packages/mbsystem/trunk/debian/patches/00list	2010-01-01 08:38:11 UTC (rev 2650)
@@ -1,2 +1 @@
 install_makefiles
-mbps_c_gmt431

Modified: packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch
===================================================================
--- packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch	2009-12-27 10:13:55 UTC (rev 2649)
+++ packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch	2010-01-01 08:38:11 UTC (rev 2650)
@@ -5,31 +5,38 @@
 ## DP: Makefile adjustments suitable for Debian
 
 @DPATCH@
---- install_makefiles.ORIG      2009-08-27 23:53:46.000000000 +1200
-+++ install_makefiles   2009-08-28 00:01:00.000000000 +1200
-@@ -97,21 +97,21 @@
+--- install_makefiles.ORIG	2010-01-01 20:16:22.000000000 +1300
++++ install_makefiles	2010-01-01 21:33:37.000000000 +1300
+@@ -102,27 +102,26 @@
+ #--------------------------------------------------------------------
  #
  # Required parameters:
- $MBSYSTEM_HOME = "/usr/share/mbsystem";
+-$MBSYSTEM_HOME = "/usr/local/mbsystem";
 -$OS = "DARWIN";
++$MBSYSTEM_HOME = "/usr/share/mbsystem";
 +$OS = "LINUX";
- $CFLAGS = "-g -I/usr/X11R6/include";
--$LFLAGS = "-Wl -lm -bind_at_load -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/LibGL.dylib";
+ $CFLAGS = "-Wall -g -I/usr/X11R6/include";
+-$LFLAGS = "-Wall -lm -bind_at_load -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/LibGL.dylib";
 -$NETCDFLIBDIR = "/sw/lib";
 -$NETCDFINCDIR = "/sw/include";
 -$GMTLIBDIR = "/usr/local/gmt/lib";
 -$GMTINCDIR = "/usr/local/gmt/include";
+-$LEVITUS = "$MBSYSTEM_HOME/share/LevitusAnnual82.dat";
 +$LFLAGS = "-Wl -lm";
 +$NETCDFLIBDIR = "/usr/lib";
 +$NETCDFINCDIR = "/usr/include";
 +$GMTLIBDIR = "/usr/lib";
 +$GMTINCDIR = "/usr/include/gmt";
--$LEVITUS = "$MBSYSTEM_HOME/share/LevitusAnnual82.dat";
--$PROJECTIONS = "$MBSYSTEM_HOME/share/Projections.dat";
-+$LEVITUS = "$MBSYSTEM_HOME/LevitusAnnual82.dat";
-+$PROJECTIONS = "$MBSYSTEM_HOME/Projections.dat";
+ $PROJECTIONS = "$MBSYSTEM_HOME/share/Projections.dat";
  #
- # Required paramters for graphical tools
+ # Required parameters for spectrogram program mbsegypsd
+ #   - mbsegypsd will not be built if these are commented out
+-$FFTWLIBDIR = "/usr/local/fftw/lib";
+-$FFTWINCDIR = "/usr/local/fftw/include";
++$FFTWLIBDIR = "/usr/lib";
++$FFTWINCDIR = "/usr/include";
+ #
+ # Required parameters for graphical tools
  #   - graphical tools will not be built if these
  #     are commented out
 -$MOTIFINCDIR = "/sw/include";
@@ -37,5 +44,25 @@
 +$MOTIFINCDIR = "/usr/include";
 +$MOTIFLIBS = "-L/usr/lib -L/usr/X11R6/lib -lXm -lXt -lX11";
  #
- # Required paramter for visualization tools
+ # Required parameter for visualization tools
  #   - visualization tools will not be built if this
+@@ -133,7 +132,7 @@
+ $LEVITUS = "$MBSYSTEM_HOME/share/LevitusAnnual82.dat";
+ #
+ # Required parameter for mbotps program
+-$OTPSDIR = "/usr/local/OTPSnc";
++#$OTPSDIR = "/usr/local/OTPSnc";
+ #
+ # Optional parameter for use of non-default C compiler
+ #$CC = "cc";
+@@ -147,8 +146,8 @@
+ # Optional parameters for use of independent PROJ4 library installation
+ #   - PROJ4 library included with MB-System will be used 
+ #     if these are commented out
+-#$PROJLIB = "/usr/local/proj/lib/libproj.a";
+-#$PROJINCDIR = "/usr/local/proj/include/";
++$PROJLIB = "/usr/lib/libproj.a";
++$PROJINCDIR = "/usr/include/";
+ #
+ #--------------------------------------------------------------------
+ # END OF PARAMETER EDITING SECTION

Deleted: packages/mbsystem/trunk/debian/patches/mbps_c_gmt431.dpatch
===================================================================
--- packages/mbsystem/trunk/debian/patches/mbps_c_gmt431.dpatch	2009-12-27 10:13:55 UTC (rev 2649)
+++ packages/mbsystem/trunk/debian/patches/mbps_c_gmt431.dpatch	2010-01-01 08:38:11 UTC (rev 2650)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## mbps_c_gmt431.dpatch by Hamish Bowman <hamish_b yahoo com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: allow to work with GMT older than version 4.5.0
-
- at DPATCH@
---- src/utilities/mbps.c.ORIG   2009-08-28 00:21:17.000000000 +1200
-+++ src/utilities/mbps.c        2009-08-28 00:22:54.000000000 +1200
-@@ -842,10 +842,17 @@
-                }
-                
-        /* initialize the Postscript plotting */
-+#ifdef GMT_MINOR_VERSION
-        ps_plotinit_hires(NULL,0,orient,x_off,y_off,1.0,1.0,1,300,1,
-                gmtdefs.paper_width, gmtdefs.page_rgb, 
-                gmtdefs.encoding.name, 
-                GMT_epsinfo (argv[0]));
-+#else
-+       ps_plotinit(NULL,0,orient,x_off,y_off,1.0,1.0,1,300,1,
-+               gmtdefs.paper_width, gmtdefs.page_rgb, 
-+               gmtdefs.encoding.name, 
-+               GMT_epsinfo (argv[0]));
-+#endif
-        GMT_echo_command (argc, argv);
-                
-        /* now loop over the data in the appropriate order

More information about the Pkg-grass-devel mailing list