r3083 - in packages/mbsystem/trunk/debian: . patches
hamish-guest at alioth.debian.org
hamish-guest at alioth.debian.org
Sun Jun 2 01:48:43 UTC 2013
Author: hamish-guest
Date: 2013-06-02 01:48:43 +0000 (Sun, 02 Jun 2013)
New Revision: 3083
Added:
packages/mbsystem/trunk/debian/patches/mbview_makefile
packages/mbsystem/trunk/debian/patches/older_autoconf
packages/mbsystem/trunk/debian/patches/series
Removed:
packages/mbsystem/trunk/debian/patches/00list
packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch
Modified:
packages/mbsystem/trunk/debian/TODO
packages/mbsystem/trunk/debian/changelog
packages/mbsystem/trunk/debian/control
packages/mbsystem/trunk/debian/rules
packages/mbsystem/trunk/debian/watch
Log:
Initial packaging with upstream support for shared libs
Modified: packages/mbsystem/trunk/debian/TODO
===================================================================
--- packages/mbsystem/trunk/debian/TODO 2012-07-05 07:40:44 UTC (rev 3082)
+++ packages/mbsystem/trunk/debian/TODO 2013-06-02 01:48:43 UTC (rev 3083)
@@ -1,6 +1,10 @@
-TODO: adapt these beginnings of a Debian build script into full packaging rules:
+TODO:
-https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
+* GMT binaries -> $PATH ?
+* Integrate GMT coastline(s)
+* adapt these beginnings of a Debian build script into full packaging rules:
+* https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
+* Audit for bundled libraries (libproj)
+* document Copyright for LevitusAnnual82.dat global water properties database
-
Property changes on: packages/mbsystem/trunk/debian/TODO
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Modified: packages/mbsystem/trunk/debian/changelog
===================================================================
--- packages/mbsystem/trunk/debian/changelog 2012-07-05 07:40:44 UTC (rev 3082)
+++ packages/mbsystem/trunk/debian/changelog 2013-06-02 01:48:43 UTC (rev 3083)
@@ -1,3 +1,9 @@
+mbsystem (5.4.2081-0) UNRELEASED; urgency=low
+
+ * Initial packaging with upstream support for shared libs
+
+ -- Hamish Bowman <hamish_b yahoo.com> Sun, 02 Jun 2013 13:09:24 +1200
+
mbsystem (5.1.2-0) UNRELEASED; urgency=low
* Initial packaging
Modified: packages/mbsystem/trunk/debian/control
===================================================================
--- packages/mbsystem/trunk/debian/control 2012-07-05 07:40:44 UTC (rev 3082)
+++ packages/mbsystem/trunk/debian/control 2013-06-02 01:48:43 UTC (rev 3083)
@@ -2,19 +2,21 @@
Section: science
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,
+Uploaders: M. Hamish Bowman <hamish_b at yahoo.com>
+Build-depends: debhelper (>= 8), dh-autoreconf,
+ libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev,
libgl1-mesa-dev, libfftw3-dev, libproj-dev
-Standards-Version:
+Standards-Version: 3.9.4
Homepage: http://www.ldeo.columbia.edu/res/pi/MB-System/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/mbsystem/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/mbsystem/trunk/debian/
Package: mbsystem
Section: science
Architecture: any
-Depends: ${shlibs:Depends}, gmt, lesstif2, libnetcdf4, libgl1-mesa-glx,
- libglu1-mesa, libfftw3-3, libproj0
-Suggests: ghostscript, proj-bin, xv
-Recommends:
+Depends: ${shlibs:Depends}, ${misc:Depends}, csh, gmt
+Recommends: gv, libparallel-forkmanager-perl
+Suggests: ghostscript, proj-bin
Description: Processing tools for multibeam and sidescan sonar data
MB-System is an open source software package for the processing and
display of bathymetry and backscatter imagery data derived from
Deleted: packages/mbsystem/trunk/debian/patches/00list
===================================================================
--- packages/mbsystem/trunk/debian/patches/00list 2012-07-05 07:40:44 UTC (rev 3082)
+++ packages/mbsystem/trunk/debian/patches/00list 2013-06-02 01:48:43 UTC (rev 3083)
@@ -1 +0,0 @@
-install_makefiles
Deleted: packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch
===================================================================
--- packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch 2012-07-05 07:40:44 UTC (rev 3082)
+++ packages/mbsystem/trunk/debian/patches/install_makefiles.dpatch 2013-06-02 01:48:43 UTC (rev 3083)
@@ -1,68 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## install_makefiles.dpatch by Hamish Bowman <hamish_b yahoo com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makefile adjustments suitable for Debian
-
- at DPATCH@
---- 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/local/mbsystem";
--$OS = "DARWIN";
-+$MBSYSTEM_HOME = "/usr/share/mbsystem";
-+$OS = "LINUX";
- $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";
- $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 parameters for graphical tools
- # - graphical tools will not be built if these
- # are commented out
--$MOTIFINCDIR = "/sw/include";
--$MOTIFLIBS = "-L/sw/lib -L/usr/X11R6/lib -lXm -lXt -lX11";
-+$MOTIFINCDIR = "/usr/include";
-+$MOTIFLIBS = "-L/usr/lib -L/usr/X11R6/lib -lXm -lXt -lX11";
- #
- # 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
Added: packages/mbsystem/trunk/debian/patches/mbview_makefile
===================================================================
--- packages/mbsystem/trunk/debian/patches/mbview_makefile (rev 0)
+++ packages/mbsystem/trunk/debian/patches/mbview_makefile 2013-06-02 01:48:43 UTC (rev 3083)
@@ -0,0 +1,12 @@
+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
Added: packages/mbsystem/trunk/debian/patches/older_autoconf
===================================================================
--- packages/mbsystem/trunk/debian/patches/older_autoconf (rev 0)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf 2013-06-02 01:48:43 UTC (rev 3083)
@@ -0,0 +1,12 @@
+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], )
Added: packages/mbsystem/trunk/debian/patches/series
===================================================================
--- packages/mbsystem/trunk/debian/patches/series (rev 0)
+++ packages/mbsystem/trunk/debian/patches/series 2013-06-02 01:48:43 UTC (rev 3083)
@@ -0,0 +1,3 @@
+# patches to apply
+older_autoconf
+mbview_makefile
Modified: packages/mbsystem/trunk/debian/rules
===================================================================
--- packages/mbsystem/trunk/debian/rules 2012-07-05 07:40:44 UTC (rev 3082)
+++ packages/mbsystem/trunk/debian/rules 2013-06-02 01:48:43 UTC (rev 3083)
@@ -3,42 +3,53 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+#
+# # These are used for cross-compiling and for saving the configure script
+# # from having to guess our platform (since we know it already)
+# DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+# DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+%:
+ dh $@ --parallel --with autoreconf
+override_dh_autoreconf:
+ [ ! -x "./autogen.sh" ] || ./autogen.sh
+ dh_autoreconf
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --enable-static=no \
+ --with-gmt-include=/usr/include/gmt
-# apply patches
-include /usr/share/dpatch/dpatch.make
+#todo:
+#get-orig-source:
+# uscan --noconf --destdir=. --download-current-version --rename --verbose
-# configure
-./install_makefiles
-# make
-make all
-
-
-# install
-## sort of modeled after GMT packaging:
-install bin/* /usr/lib/mbsystem/bin
-install --mode=644 lib/* /usr/lib/mbsystem
-install --mode=644 man/manl/* /usr/share/man/man1
-install --mode=644 html /usr/share/doc/mbsystem/html
-install --mode=644 ps /usr/share/doc/mbsystem/ps
-install --mode=644 share /usr/share/mbsystem
-install --mode=644 include /usr/lib/mbsystem/include
-
-# get Levitus annual water temperature profile database (binary blob)
-# needed for mblevitus program, uncompressed it is 16mb.
-#
-wget -nv ftp://ftp.ldeo.columbia.edu/pub/MB-System/annual.gz
-gzip -d annual.gz
-\mv annual LevitusAnnual82.dat
-install --mode=644 LevitusAnnual82.data /usr/share/mbsystem/
+# # apply patches
+# include /usr/share/dpatch/dpatch.make
+#
+#
+# # install
+# ## sort of modeled after GMT packaging:
+# install bin/* /usr/lib/mbsystem/bin
+# install --mode=644 lib/* /usr/lib/mbsystem
+# install --mode=644 man/manl/* /usr/share/man/man1
+# install --mode=644 html /usr/share/doc/mbsystem/html
+# install --mode=644 ps /usr/share/doc/mbsystem/ps
+# install --mode=644 share /usr/share/mbsystem
+# install --mode=644 include /usr/lib/mbsystem/include
+#
+#now integrated:
+# # get Levitus annual water temperature profile database (binary blob)
+# # needed for mblevitus program, uncompressed it is 16mb.
+# #
+# wget -nv ftp://ftp.ldeo.columbia.edu/pub/MB-System/annual.gz
+# gzip -d annual.gz
+# \mv annual LevitusAnnual82.dat
+# install --mode=644 LevitusAnnual82.data /usr/share/mbsystem/
Modified: packages/mbsystem/trunk/debian/watch
===================================================================
--- packages/mbsystem/trunk/debian/watch 2012-07-05 07:40:44 UTC (rev 3082)
+++ packages/mbsystem/trunk/debian/watch 2013-06-02 01:48:43 UTC (rev 3083)
@@ -1,5 +1,2 @@
version=
-ftp://ftp.ldeo.columbia.edu/pub/MB-System/mbsystem-( ??? ).tar.gz
-#
-# e.g. ftp://ftp.ldeo.columbia.edu/pub/MB-System/mbsystem-5.1.2beta11.tar.gz
-#
+ftp://ftp.ldeo.columbia.edu/pub/MB-System/mbsystem-([\d\.]+)\.tar\.gz
More information about the Pkg-grass-devel
mailing list