This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository mbsystem.

commit 5eb222022fd2a9e534264e157f6a4876d465a491
Author: Andreas Tille <ti...@debian.org>
Date:   Thu Aug 20 09:29:33 2015 +0200

    Reinject debian/ dir
---
 debian/TODO                       |  8 ++++
 debian/changelog                  | 15 ++++++
 debian/compat                     |  1 +
 debian/control                    | 64 +++++++++++++++++++++++++
 debian/copyright                  | 98 +++++++++++++++++++++++++++++++++++++++
 debian/gmt_path-MBSys.sh          |  7 +++
 debian/mbsystem-data.install      |  1 +
 debian/mbsystem-dev.dirs          |  1 +
 debian/mbsystem-dev.install       |  4 ++
 debian/mbsystem-doc.dirs          |  1 +
 debian/mbsystem-doc.doc-base      | 13 ++++++
 debian/mbsystem-doc.install       |  2 +
 debian/mbsystem-doc.links         |  1 +
 debian/mbsystem.docs              |  4 ++
 debian/mbsystem.install           |  4 ++
 debian/patches/series             |  1 +
 debian/patches/system_proj4.patch | 70 ++++++++++++++++++++++++++++
 debian/rules                      | 44 ++++++++++++++++++
 debian/source/format              |  1 +
 debian/watch                      |  2 +
 20 files changed, 342 insertions(+)

diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..6e1ac94
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,8 @@
+TODO:
+
+* Integrate the GMT coastline(s)
+* Audit & remove bundled libraries (libproj)
+* Document copyright for LevitusAnnual82.dat global water properties
+  database (US Fed. Gov't product, NOAA)
+
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..3711467
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,15 @@
+mbsystem (5.4.2220-0) UNRELEASED; urgency=low
+
+  * Initial packaging incorporating upstream support for shared libs
+  * Split off -dev, -doc, -data packages
+  * Added doc-base registration
+  * Enable GSF support (now licensed by SAIC as LGPL 2.1)
+
+ -- M. Hamish Bowman <hamish.webmail gmail.com>  Mon, 15 Jun 2015 17:31:55 
+1200
+
+mbsystem (5.1.2-0) UNRELEASED; urgency=low
+
+  * Initial packaging
+  * Update for new 5.1.2 release
+
+ -- M. Hamish Bowman <hamish.webmail gmail.com>  Fri,  1 Jan 2010 21:17:28 
+1300
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..4d737ed
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,64 @@
+Source: mbsystem
+Section: science
+Priority: optional
+Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
+Uploaders: M. Hamish Bowman <hamis...@yahoo.com>
+Build-depends: debhelper (>= 8), dh-autoreconf,
+  libgmt-dev, lesstif2-dev | libmotif-dev, libxt-dev, libnetcdf-dev,
+  libglu1-mesa-dev, libgl1-mesa-dev, libfftw3-dev, libproj-dev
+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}, ${misc:Depends}, ${perl:Depends},
+         csh, gmt, libparallel-forkmanager-perl
+Recommends: mbsystem-doc, mbsystem-data, gv
+Suggests: proj-bin, gimp
+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.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..f884fc6
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,98 @@
+MB-System Copyright
+===================
+
+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.
+
diff --git a/debian/gmt_path-MBSys.sh b/debian/gmt_path-MBSys.sh
new file mode 100644
index 0000000..684c834
--- /dev/null
+++ b/debian/gmt_path-MBSys.sh
@@ -0,0 +1,7 @@
+# add GMT binaries to the PATH if needed
+
+GMTBIN="/usr/lib/gmt/bin"
+
+if [ `echo "$PATH" | grep -c "$GMTBIN"` -eq 0 ] ; then
+   PATH="$PATH:$GMTBIN"
+fi
diff --git a/debian/mbsystem-data.install b/debian/mbsystem-data.install
new file mode 100644
index 0000000..eae9cf1
--- /dev/null
+++ b/debian/mbsystem-data.install
@@ -0,0 +1 @@
+usr/share/mbsystem/
diff --git a/debian/mbsystem-dev.dirs b/debian/mbsystem-dev.dirs
new file mode 100644
index 0000000..3b3b22a
--- /dev/null
+++ b/debian/mbsystem-dev.dirs
@@ -0,0 +1 @@
+usr/include/mbsystem
diff --git a/debian/mbsystem-dev.install b/debian/mbsystem-dev.install
new file mode 100644
index 0000000..48ac2de
--- /dev/null
+++ b/debian/mbsystem-dev.install
@@ -0,0 +1,4 @@
+usr/include/mbsystem/
+usr/lib/*.a
+usr/lib/*.la
+usr/lib/*.so
diff --git a/debian/mbsystem-doc.dirs b/debian/mbsystem-doc.dirs
new file mode 100644
index 0000000..2a831ed
--- /dev/null
+++ b/debian/mbsystem-doc.dirs
@@ -0,0 +1 @@
+usr/share/doc/mbsystem-doc/docs
diff --git a/debian/mbsystem-doc.doc-base b/debian/mbsystem-doc.doc-base
new file mode 100644
index 0000000..d9a08c3
--- /dev/null
+++ b/debian/mbsystem-doc.doc-base
@@ -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/html/index.html
+Files: /usr/share/doc/mbsystem-doc/docs/html/*.html 
/usr/share/doc/mbsystem-doc/docs/html/*.gif
+
+Format: PostScript
+Files: /usr/share/doc/mbsystem-doc/docs/ps/*.ps.gz
diff --git a/debian/mbsystem-doc.install b/debian/mbsystem-doc.install
new file mode 100644
index 0000000..e1b4184
--- /dev/null
+++ b/debian/mbsystem-doc.install
@@ -0,0 +1,2 @@
+usr/share/doc/mbsystem/docs/html /usr/share/doc/mbsystem-doc/docs/
+usr/share/doc/mbsystem/docs/ps /usr/share/doc/mbsystem-doc/docs/
diff --git a/debian/mbsystem-doc.links b/debian/mbsystem-doc.links
new file mode 100644
index 0000000..a16d296
--- /dev/null
+++ b/debian/mbsystem-doc.links
@@ -0,0 +1 @@
+usr/share/doc/mbsystem-doc/docs        usr/share/doc/mbsystem/docs
diff --git a/debian/mbsystem.docs b/debian/mbsystem.docs
new file mode 100644
index 0000000..8cf08a3
--- /dev/null
+++ b/debian/mbsystem.docs
@@ -0,0 +1,4 @@
+AUTHORS
+COPYING
+NOTES
+README
diff --git a/debian/mbsystem.install b/debian/mbsystem.install
new file mode 100644
index 0000000..4bab9e7
--- /dev/null
+++ b/debian/mbsystem.install
@@ -0,0 +1,4 @@
+usr/bin
+usr/lib/*.so.*
+usr/share/man
+debian/gmt_path-MBSys.sh /etc/profile.d/
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3ca62fb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+system_proj4.patch
diff --git a/debian/patches/system_proj4.patch 
b/debian/patches/system_proj4.patch
new file mode 100644
index 0000000..1e88303
--- /dev/null
+++ b/debian/patches/system_proj4.patch
@@ -0,0 +1,70 @@
+Last-Update: 2013-06-02
+Author: Hamish Bowman <hamish_b yahoo.com>
+Applied-Upstream: no
+Forwarded: no
+Bug-MC:
+Description: Use Debian's PROJ.4 programs instead of bundled ones
+
+
+--- a/src/proj/Makefile.am     (revision 2098)
++++ b/src/proj/Makefile.am     (working copy)
+@@ -1,14 +1,14 @@
+-bin_PROGRAMS = proj geod
++#bin_PROGRAMS = proj geod
+ 
+ AM_CPPFLAGS = -I@top_srcdir@/src/mbio
+ 
+ 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 2120)
++++ b/src/man/man1/Makefile.am (working copy)
+@@ -1,4 +1,4 @@
+-man_MANS = geod.1 \
++man_MANS = \
+ mbhsdump.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 2098)
++++ 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)
+ 
+--- a/src/man/whatis   (revision 2120)
++++ b/src/man/whatis   (working copy)
+@@ -1,6 +1,5 @@
+ MBeditviz(1)             - 3D visualization-based editing of swath bathymetry 
soundings
+ MBgrdviz(1)              - Simple interactive 2D/3D visualization of GMT grids
+-geod(1)                  - direct geodesic computations invgeod - inverse 
geodesic computations
+ hsdump(1)                - hsdump lists the information contained in 
Hydrosweep DS data files
+ mb7k2jstar(1)            - extracts subbottom profiler and/or sidescan sonar 
data from Reson 7k format data files into Edgetech Jstar format data files
+ mb7k2ss(1)               - extracts sidescan sonar data from Reson 7k format 
data, bins and lays the sidescan onto the seafloor, and outputs files in the 
MBF_MBLDEOIH formst (MBIO format id 71)
+@@ -78,5 +77,3 @@
+ mbsystem(1)              - A set of utilities for manipulating and processing 
swath sonar bathymetry, amplitude, and sidescan data
+ mbtime(1)                - Translate between calendar time values and unix 
time
+ mbvelocitytool(1)        - Interactive water sound velocity profile editor
+-pj_init(3)               - initialize cartographic projection pj_init_plus - 
initialize cartographic projection pj_fwd - forward cartographic projection 
pj_inv - inverse cartographic projection pj_transform - transform between 
coordinate systems pj_free - de-initialize projection
+-proj(1)                  - forward cartographic projection filter invproj - 
inverse cartographic projection filter
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..57f1e47
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,44 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+%:
+       dh $@ --parallel
+
+
+override_dh_auto_configure:
+       $(shell dpkg-buildflags --export=configure) \
+       dh_auto_configure -- \
+               --includedir=/usr/include/mbsystem \
+               --docdir=/usr/share/doc/mbsystem/docs \
+               --with-gmt-include=/usr/include/gmt
+
+# dpkg-buildflags needed for hardening support if compat is held at '8'.
+# The --exp=config doesn't exist on Squeeze, remove the line when building
+#   there and live without hardening. It's ok on ubuntu 12.04 though.
+
+override_dh_installchangelogs:
+       dh_installchangelogs ChangeLog
+
+override_dh_install:
+       # take care of lintian tag: non-empty-dependency_libs-in-la-file
+       sed -i "/dependency_libs/ s/'.*'/''/" `find 
$(CURDIR)/debian/tmp/usr/lib -name '*.la'`
+       dh_install
+
+
+# problematic: the upstream tarball is officially "pkg-latest.tar.gz",
+#  which is then symlinked to an exact pkg-x.y.svn_rev.tar.gz filename.
+#  but sometimes there are newer x.y.svn_rev versions there for testing,
+#  so we can't rely on the biggest number there being a real release.
+#get-orig-source:
+#      uscan --noconf --destdir=. --download-current-version --rename --verbose
+
+
+# PDF doc generation and install:
+# ps2pdf + 'pdftk cat' to combine all .ps man pages into a single
+#  PDF document.
+#  use ReStructured text to PDF or TeX to make the cover page.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..bf33850
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.ldeo.columbia.edu/pub/MB-System/mbsystem-([\d\.]+)\.tar\.gz

-- 
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

Reply via email to