r3084 - in packages/mbsystem/trunk/debian: . patches source
Author: hamish-guest Date: 2013-06-02 02:20:44 + (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 +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 +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/format2013-06-02 02:20:44 UTC (rev 3084) @@ -0,0 +1 @@
r3085 - in packages/mbsystem/trunk/debian: . patches
Author: hamish-guest
Date: 2013-06-02 05:08:51 + (Sun, 02 Jun 2013)
New Revision: 3085
Added:
packages/mbsystem/trunk/debian/mbsystem-data.install
packages/mbsystem/trunk/debian/mbsystem-dev.dirs
packages/mbsystem/trunk/debian/mbsystem-dev.install
packages/mbsystem/trunk/debian/mbsystem-doc.dirs
packages/mbsystem/trunk/debian/mbsystem-doc.install
packages/mbsystem/trunk/debian/mbsystem.install
Modified:
packages/mbsystem/trunk/debian/changelog
packages/mbsystem/trunk/debian/control
packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
packages/mbsystem/trunk/debian/patches/series
packages/mbsystem/trunk/debian/rules
packages/mbsystem/trunk/debian/watch
Log:
split off -data, -dev, -doc pkgs; comment out not-working-yet patch
Modified: packages/mbsystem/trunk/debian/changelog
===
--- packages/mbsystem/trunk/debian/changelog2013-06-02 02:20:44 UTC (rev
3084)
+++ packages/mbsystem/trunk/debian/changelog2013-06-02 05:08:51 UTC (rev
3085)
@@ -1,6 +1,7 @@
mbsystem (5.4.2081-0) UNRELEASED; urgency=low
- * Initial packaging with upstream support for shared libs
+ * Initial packaging incorporating upstream support for shared libs
+ * Split off -dev, -doc, -data packages
-- Hamish Bowman Sun, 02 Jun 2013 13:09:24 +1200
Modified: packages/mbsystem/trunk/debian/control
===
--- packages/mbsystem/trunk/debian/control 2013-06-02 02:20:44 UTC (rev
3084)
+++ packages/mbsystem/trunk/debian/control 2013-06-02 05:08:51 UTC (rev
3085)
@@ -15,10 +15,49 @@
Section: science
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, csh, gmt
-Recommends: gv, libparallel-forkmanager-perl
+Recommends: mbsystem-doc, mbsystem-data, 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
multibeam, interferometry, and sidescan sonars. It interacts with GMT
(The Generic Mapping Tools) and other GIS applications.
+
+Package: mbsystem-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: mbsystem
+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
+ multibeam, interferometry, and sidescan sonars. It interacts with GMT
+ (The Generic Mapping Tools) and other GIS applications.
+ .
+ This package contains the MB-System documentation.
+
+Package: mbsystem-data
+Section: science
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: mbsystem
+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
+ multibeam, interferometry, and sidescan sonars. It interacts with GMT
+ (The Generic Mapping Tools) and other GIS applications.
+ .
+ This package contains the Levitus global water properties database.
+
+Package: mbsystem-dev
+Section: devel
+Architecture: any
+Depends: mbsystem, ${misc:Depends}
+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
+ multibeam, interferometry, and sidescan sonars. It interacts with GMT
+ (The Generic Mapping Tools) and other GIS applications.
+ .
+ This package contains header files and static libraries needed to
+ build software based on MB-System.
Added: packages/mbsystem/trunk/debian/mbsystem-data.install
===
--- packages/mbsystem/trunk/debian/mbsystem-data.install
(rev 0)
+++ packages/mbsystem/trunk/debian/mbsystem-data.install2013-06-02
05:08:51 UTC (rev 3085)
@@ -0,0 +1 @@
+usr/share/mbsystem/
Added: packages/mbsystem/trunk/debian/mbsystem-dev.dirs
===
--- packages/mbsystem/trunk/debian/mbsystem-dev.dirs
(rev 0)
+++ packages/mbsystem/trunk/debian/mbsystem-dev.dirs2013-06-02 05:08:51 UTC
(rev 3085)
@@ -0,0 +1 @@
+usr/include/mbsystem
Added: packages/mbsystem/trunk/debian/mbsystem-dev.install
===
--- packages/mbsystem/trunk/debian/mbsystem-dev.install
(rev 0)
+++ packages/mbsystem/trunk/debian/mbsystem-dev.install 2013-06-02 05:08:51 UTC
(rev 3085)
@@ -0,0 +1,4 @@
+usr/include/mbsystem/
+usr/lib/*.a
+usr/lib/*.la
+usr/lib/*.so
Added: packages/mbsystem/trunk/debian/mbsystem-doc.dirs
r3083 - in packages/mbsystem/trunk/debian: . patches
Author: hamish-guest
Date: 2013-06-02 01:48:43 + (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/changelog2012-07-05 07:40:44 UTC (rev
3082)
+++ packages/mbsystem/trunk/debian/changelog2013-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 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
-Uploaders:
-Build-depends: libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev,
+Uploaders: M. Hamish Bowman
+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
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makefile adjustments suitable for Debian
-
-@DPATCH@
install_makefiles.ORIG 2010-01-01 20:16:22.0 +1300
-+++ install_makefiles 2010-01-01 21:33:37.0 +1300
-@@ -102,27 +102,26 @@
- #
- #
- # Required parameters:
--$MBSYSTEM_HOME = "/usr/local/mbsystem";
--$OS = "DARWIN";
-+$MBSYSTEM_HOME = "/usr/share/
r3089 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-02 08:11:25 + (Sun, 02 Jun 2013) New Revision: 3089 Modified: packages/mbsystem/trunk/debian/rules Log: clear out some comment cruft Modified: packages/mbsystem/trunk/debian/rules === --- packages/mbsystem/trunk/debian/rules2013-06-02 07:42:08 UTC (rev 3088) +++ packages/mbsystem/trunk/debian/rules2013-06-02 08:11:25 UTC (rev 3089) @@ -3,13 +3,7 @@ # 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) - export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: @@ -31,26 +25,9 @@ # uscan --noconf --destdir=. --download-current-version --rename --verbose +# cleaner doc install +# install --mode=644 html /usr/share/doc/mbsystem-doc/html +# install --mode=644 ps /usr/share/doc/mbsystem-doc/ps +# ps2pdf + pdftk cat all .ps man pages into a single PDF document. +# see the osgeolive mb-system build script for the code. -# # 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/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: There, now, wasnât t̲h̲a̲t̲ hard
Processing commands for cont...@bugs.debian.org: > tags 695607 + patch Bug #695607 [src:hdf5] hdf5: FTBFS: tries to build openmpi module without depending on openmpi Added tag(s) patch. > thanks Stopping processing here. Please contact me if you need assistance. -- 695607: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695607 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#695607: There, now, wasnât t̲h̲a̲t̲ hard
tags 695607 + patch thanks The attached patch fixes this issue at least on m68k; the dependency in debian/control is correct already, in the current version (1.8.10-patch1-1), but debian/rules lacked the whitelist (which I still think should be reversed). Other port maintainers might want to do the same. bye, //mirabilos -- 17:08⎜«Vutral» früher gabs keine packenden smartphones und so 17:08⎜«Vutral» heute gibts frauen die sind facebooksüchtig 17:10⎜«Vutral» aber auch traurig; früher warst du als nerd voll am arsch 17:10⎜«Vutral» heute bist du als nerd der einzige der wirklich damit klarkommtdiff -Nru hdf5-1.8.10-patch1/debian/changelog hdf5-1.8.10-patch1/debian/changelog --- hdf5-1.8.10-patch1/debian/changelog 2013-05-15 21:07:11.0 + +++ hdf5-1.8.10-patch1/debian/changelog 2013-05-31 12:39:06.0 + @@ -1,3 +1,9 @@ +hdf5 (1.8.10-patch1-1+m68k.1) unreleased; urgency=low + + * Disable openmpi on m68k, too (Closes: #695607) + + -- Thorsten Glaser Fri, 31 May 2013 12:37:32 + + hdf5 (1.8.10-patch1-1) unstable; urgency=low [ Helmut Grohne ] diff -Nru hdf5-1.8.10-patch1/debian/rules hdf5-1.8.10-patch1/debian/rules --- hdf5-1.8.10-patch1/debian/rules 2013-05-15 21:07:11.0 + +++ hdf5-1.8.10-patch1/debian/rules 2013-05-31 12:36:37.0 + @@ -38,6 +38,8 @@ build_openmpi = no else ifeq ($(DEB_HOST_ARCH),hppa) build_openmpi = no +else ifeq ($(DEB_HOST_ARCH),m68k) +build_openmpi = no else ifeq ($(DEB_HOST_ARCH),mips) build_openmpi = no else ifeq ($(DEB_HOST_ARCH),mipsel) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3090 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-02 08:34:27 + (Sun, 02 Jun 2013) New Revision: 3090 Modified: packages/mbsystem/trunk/debian/copyright Log: update copyright statement Modified: packages/mbsystem/trunk/debian/copyright === --- packages/mbsystem/trunk/debian/copyright2013-06-02 08:11:25 UTC (rev 3089) +++ packages/mbsystem/trunk/debian/copyright2013-06-02 08:34:27 UTC (rev 3090) @@ -1,4 +1,98 @@ -GPL 3 +MB-System Copyright +=== -http://www.ldeo.columbia.edu/res/pi/MB-System/html/gpl.html +MB-System Copyright (C) 1993-2013 by +David W. Caress (car...@mbari.org) + Monterey Bay Aquarium Research Institute + Moss Landing, CA 95039 +Dale N. Chayes (d...@ldeo.columbia.edu) + Lamont-Doherty Earth Observatory + Palisades, NY 10964mbbackangle.manl + +All Rights Reserved. +All Wrongs Remembered. + + http://www.ldeo.columbia.edu/res/pi/MB-System/html/mbsystem_copyright.html + http://www.ldeo.columbia.edu/res/pi/MB-System/html/gpl.html + +For the full text of the GPLv3 see /usr/share/common-licenses/GPL-3 + + +MB-System Licensing +--- + +The MB-System source code is distributed under the GNU General Public +License (version 3) as formulated by the Free Software Foundation. Early +MB-System distributions were described as "public domain", which meant +there was no restriction whatsoever on the use of the code. For over a +decade we have adopted the more restrictive GNU GPL license in order to +insure that anyone who distributes software based in whole or in part on +MB-System also distributes the modified MB-System source code and any +additional source code. + +The GNU GPL also prohibits the distribution of proprietary executables +linked with MB-System libraries unless the source code is also distributed. +We waive this restriction on distributing proprietary compiled programs for +specific software products if and only if those software products meet the +following two conditions: + + 1) The software product was created, sold, and delivered to customers +using source code derived from MB-System release 4.6 distributions. + + 2) The software product was sold and delivered to customers prior to +January 1, 2001. + + +Acknowledgment of Source Code Derived From Other Sources + + +The MB-System distribution includes some source code derived from packages +that are distributed separately and have been authored by programmers other +than the MB-System team. This includes: + + - The Generic Sensor Format (GSF) library source located in +mbsystem/src/gsf. The GSF package is distributed by the Science +Applications International Corporation under contract to the Naval +Oceanographic Office. + + - The SURF API (SAPI) library source located in mbsystem/src/surf. The +SAPI package has been released under the GNU General Public License by +Atlas Hydrographic. + + - The MR1PR library source located in mbsystem/src/mr1pr. This package has +been openly released by the Hawaii Mapping Research Group. + + - The PROJ.4 library source located in mbsystem/src/proj. This package was +originally developed by Gerald Evenden of the United States Geological +Survey, and is now maintained and distributed under an MIT license (that is +very close to public domain) by Frank Warmerdam in association with the +Open Source Geospational Foundation + + - The mb_mergesort() function found in mbsystem/src/mbio/mb_esf.c derives +from the GNU-Darwin Distribution. This code is released under both the +Apple Public Source License Version 1.1 and the BSD license, with original +copyright by the Regents of the University of California. + + +MB-System Caveat + + +The MB-System software package does not come with any warranties, nor is it +guarenteed to work on your computer or to do anything useful. The user +assumes full responsibility for the use of this software. In particular, +David W. Caress, Dale N. Chayes, the Lamont-Doherty Earth Observatory of +Columbia University, the Monterey Bay Aquarium Research Institute, or any +other individuals or organizations involved in the design and maintenance +of the MB-System software package are NOT responsible for any damage that +may follow from correct or incorrect use of these programs. + + +Debian packaging + + +This package was debianized by M. Hamish Bowman, Depts. of Geology and +Marine Science, University of Otago, Dunedin, New Zealand. +Debian packaging (c) 2010-2013 the MB-System Development Team and the +DebianGIS project under the same terms as the MB-System source package. + ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3087 - in packages/mbsystem/trunk/debian: . patches
Author: hamish-guest Date: 2013-06-02 07:05:12 + (Sun, 02 Jun 2013) New Revision: 3087 Added: packages/mbsystem/trunk/debian/mbsystem-doc.doc-base packages/mbsystem/trunk/debian/mbsystem-doc.links packages/mbsystem/trunk/debian/patches/system_proj4.patch Modified: packages/mbsystem/trunk/debian/changelog packages/mbsystem/trunk/debian/mbsystem-doc.dirs packages/mbsystem/trunk/debian/patches/series Log: further proj4 and doc install fixes Modified: packages/mbsystem/trunk/debian/changelog === --- packages/mbsystem/trunk/debian/changelog2013-06-02 05:25:03 UTC (rev 3086) +++ packages/mbsystem/trunk/debian/changelog2013-06-02 07:05:12 UTC (rev 3087) @@ -1,7 +1,8 @@ -mbsystem (5.4.2081-0) UNRELEASED; urgency=low +mbsystem (5.4.2083-0) UNRELEASED; urgency=low * Initial packaging incorporating upstream support for shared libs * Split off -dev, -doc, -data packages + * Added doc-base registration -- Hamish Bowman Sun, 02 Jun 2013 13:09:24 +1200 Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs === --- packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-02 05:25:03 UTC (rev 3086) +++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-02 07:05:12 UTC (rev 3087) @@ -1 +1,2 @@ usr/share/doc/mbsystem/docs +usr/share/doc/mbsystem-doc/docs Added: packages/mbsystem/trunk/debian/mbsystem-doc.doc-base === --- packages/mbsystem/trunk/debian/mbsystem-doc.doc-base (rev 0) +++ packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-02 07:05:12 UTC (rev 3087) @@ -0,0 +1,13 @@ +Document: mbsystem-manual +Title: The MB-System User Manual +Author: David Caress, Dale Chayes, Val Schmidt +Abstract: This is everything you'll need to know to get + up and running with the MB-System software. +Section: Science/Geoscience + +Format: HTML +Index: /usr/share/doc/mbsystem-doc/docs/index.html +Files: /usr/share/doc/mbsystem-doc/docs/*.html /usr/share/doc/mbsystem-doc/docs/*.gif + +Format: PostScript +Files: /usr/share/doc/mbsystem-doc/docs/*.ps Added: packages/mbsystem/trunk/debian/mbsystem-doc.links === --- packages/mbsystem/trunk/debian/mbsystem-doc.links (rev 0) +++ packages/mbsystem/trunk/debian/mbsystem-doc.links 2013-06-02 07:05:12 UTC (rev 3087) @@ -0,0 +1 @@ +usr/share/doc/mbsystem/docs/usr/share/doc/mbsystem/docs Modified: packages/mbsystem/trunk/debian/patches/series === --- packages/mbsystem/trunk/debian/patches/series 2013-06-02 05:25:03 UTC (rev 3086) +++ packages/mbsystem/trunk/debian/patches/series 2013-06-02 07:05:12 UTC (rev 3087) @@ -1,3 +1,4 @@ # patches to apply #older_autoconf.patch mbview_makefile.patch +system_proj4.patch Added: packages/mbsystem/trunk/debian/patches/system_proj4.patch === --- packages/mbsystem/trunk/debian/patches/system_proj4.patch (rev 0) +++ packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-02 07:05:12 UTC (rev 3087) @@ -0,0 +1,55 @@ +Last-Update: 2013-06-02 +Author: Hamish Bowman +Applied-Upstream: no +Forwarded: no +Bug-MC: +Description: Use Debian's PROJ.4 programs instead of bundled ones + + +--- a/src/proj/Makefile.am (revision 2083) b/src/proj/Makefile.am (working copy) +@@ -1,14 +1,14 @@ +-bin_PROGRAMS = proj geod ++#bin_PROGRAMS = proj geod + + AM_CPPFLAGS = -I.. + + include_HEADERS = proj_api.h + +-proj_SOURCES = proj.c gen_cheb.c p_series.c +-geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c geodesic.h ++#proj_SOURCES = proj.c gen_cheb.c p_series.c ++#geod_SOURCES = geod.c geod_set.c geod_for.c geod_inv.c geodesic.h + +-proj_LDADD = libmbproj.la +-geod_LDADD = libmbproj.la ++#proj_LDADD = libmbproj.la ++#geod_LDADD = libmbproj.la + + lib_LTLIBRARIES = libmbproj.la + +--- a/src/man/man1/Makefile.am (revision 2083) b/src/man/man1/Makefile.am (working copy) +@@ -1,4 +1,4 @@ +-man_MANS = geod.1 \ ++man_MANS = \ + hsdump.1 \ + mb7k2jstar.1 \ + mb7k2ss.1 \ +@@ -76,7 +76,6 @@ + mbswath.1 \ + mbsystem.1 \ + mbtime.1 \ +-mbvelocitytool.1 \ +-proj.1 ++mbvelocitytool.1 + + EXTRA_DIST = $(man_MANS) +--- a/src/man/man3/Makefile.am (revision 2083) b/src/man/man3/Makefile.am (working copy) +@@ -1,4 +1,4 @@ +-man_MANS = mbio.3 pj_init.3 ++man_MANS = mbio.3 + + EXTRA_DIST = $(man_MANS) + ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3091 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-02 08:48:07 + (Sun, 02 Jun 2013) New Revision: 3091 Added: packages/mbsystem/trunk/debian/mbsystem.docs Log: include tarball readmes Added: packages/mbsystem/trunk/debian/mbsystem.docs === --- packages/mbsystem/trunk/debian/mbsystem.docs (rev 0) +++ packages/mbsystem/trunk/debian/mbsystem.docs2013-06-02 08:48:07 UTC (rev 3091) @@ -0,0 +1,6 @@ +AUTHORS +COPYING +ChangeLog +NEWS +NOTES +README ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3088 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-02 07:42:08 + (Sun, 02 Jun 2013) New Revision: 3088 Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs packages/mbsystem/trunk/debian/mbsystem-doc.doc-base packages/mbsystem/trunk/debian/mbsystem-doc.install packages/mbsystem/trunk/debian/mbsystem-doc.links Log: further doc install fixes Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs === --- packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-02 07:05:12 UTC (rev 3087) +++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs2013-06-02 07:42:08 UTC (rev 3088) @@ -1,2 +1 @@ -usr/share/doc/mbsystem/docs usr/share/doc/mbsystem-doc/docs Modified: packages/mbsystem/trunk/debian/mbsystem-doc.doc-base === --- packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-02 07:05:12 UTC (rev 3087) +++ packages/mbsystem/trunk/debian/mbsystem-doc.doc-base2013-06-02 07:42:08 UTC (rev 3088) @@ -10,4 +10,4 @@ Files: /usr/share/doc/mbsystem-doc/docs/*.html /usr/share/doc/mbsystem-doc/docs/*.gif Format: PostScript -Files: /usr/share/doc/mbsystem-doc/docs/*.ps +Files: /usr/share/doc/mbsystem-doc/docs/*.ps.gz Modified: packages/mbsystem/trunk/debian/mbsystem-doc.install === --- packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-02 07:05:12 UTC (rev 3087) +++ packages/mbsystem/trunk/debian/mbsystem-doc.install 2013-06-02 07:42:08 UTC (rev 3088) @@ -1 +1 @@ -usr/share/doc/mbsystem/docs +usr/share/doc/mbsystem/docs /usr/share/doc/mbsystem-doc Modified: packages/mbsystem/trunk/debian/mbsystem-doc.links === --- packages/mbsystem/trunk/debian/mbsystem-doc.links 2013-06-02 07:05:12 UTC (rev 3087) +++ packages/mbsystem/trunk/debian/mbsystem-doc.links 2013-06-02 07:42:08 UTC (rev 3088) @@ -1 +1 @@ -usr/share/doc/mbsystem/docs/usr/share/doc/mbsystem/docs +usr/share/doc/mbsystem-doc/docsusr/share/doc/mbsystem/docs ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3092 - packages/mbsystem/trunk/debian
Author: hamish-guest Date: 2013-06-02 08:59:33 + (Sun, 02 Jun 2013) New Revision: 3092 Modified: packages/mbsystem/trunk/debian/mbsystem.docs Log: omit placeholder file Modified: packages/mbsystem/trunk/debian/mbsystem.docs === --- packages/mbsystem/trunk/debian/mbsystem.docs2013-06-02 08:48:07 UTC (rev 3091) +++ packages/mbsystem/trunk/debian/mbsystem.docs2013-06-02 08:59:33 UTC (rev 3092) @@ -1,6 +1,5 @@ AUTHORS COPYING ChangeLog -NEWS NOTES README ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
r3086 - packages/mbsystem/trunk/debian/patches
Author: hamish-guest
Date: 2013-06-02 05:25:03 + (Sun, 02 Jun 2013)
New Revision: 3086
Modified:
packages/mbsystem/trunk/debian/patches/older_autoconf.patch
Log:
patch to fix missing library spec
Modified: packages/mbsystem/trunk/debian/patches/older_autoconf.patch
===
--- packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-02
05:08:51 UTC (rev 3085)
+++ packages/mbsystem/trunk/debian/patches/older_autoconf.patch 2013-06-02
05:25:03 UTC (rev 3086)
@@ -16,3 +16,12 @@
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=DIRLocation of GMT library],
+ [libgmt_CFLAGS="-L${withval}"] [GOT_GMT=yes], [GOT_GMT=no])
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
