This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository mbsystem.
commit 875a92477384aa848fa7cdfdf3815eaf71fe20fd
Author: M. Hamish Bowman <hamis...@yahoo.com>
Date: Fri Jan 1 08:38:11 2010 +0000
update for new 5.1.2-final release
---
debian/changelog | 5 ++--
debian/control | 8 ++++--
debian/copyright | 2 +-
debian/patches/00list | 1 -
debian/patches/install_makefiles.dpatch | 51 +++++++++++++++++++++++++--------
debian/patches/mbps_c_gmt431.dpatch | 27 -----------------
6 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index eb28bc7..a7b7bbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index 4923e87..9c902a3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,17 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel@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
diff --git a/debian/copyright b/debian/copyright
index 7fa766f..ff7a6b4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-GPL 2
+GPL 3
http://www.ldeo.columbia.edu/res/pi/MB-System/html/gpl.html
diff --git a/debian/patches/00list b/debian/patches/00list
index 8d2846d..30abd11 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1 @@
install_makefiles
-mbps_c_gmt431
diff --git a/debian/patches/install_makefiles.dpatch
b/debian/patches/install_makefiles.dpatch
index 33d8958..e167702 100644
--- a/debian/patches/install_makefiles.dpatch
+++ b/debian/patches/install_makefiles.dpatch
@@ -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 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 paramters for graphical tools
+ # 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
diff --git a/debian/patches/mbps_c_gmt431.dpatch
b/debian/patches/mbps_c_gmt431.dpatch
deleted file mode 100644
index 0b1a81d..0000000
--- a/debian/patches/mbps_c_gmt431.dpatch
+++ /dev/null
@@ -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
-
-@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
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/mbsystem.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
