[mbsystem] 24/39: add perl:Depends, add'l embedded proj4 cleanout, hardening flags for sid

[Andreas Tille]

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

tille pushed a commit to branch master
in repository mbsystem.

commit e7823a88ec71daa330032f8f8d010010cba8f42c
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sat Jun 8 05:08:25 2013 +0000

    add perl:Depends, add'l embedded proj4 cleanout, hardening flags for sid
---
 debian/control                    |  2 +-
 debian/patches/system_proj4.patch | 15 +++++++++++++++
 debian/rules                      |  7 ++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 449de80..30e1510 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/mbsystem/trunk/deb
 Package: mbsystem
 Section: science
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
          csh, gmt, libparallel-forkmanager-perl
 Recommends: mbsystem-doc, mbsystem-data, gv
 Suggests: proj-bin, gimp
diff --git a/debian/patches/system_proj4.patch b/debian/patches/system_proj4.patch
index a9b5eec..1e88303 100644
--- a/debian/patches/system_proj4.patch
+++ b/debian/patches/system_proj4.patch
@@ -53,3 +53,18 @@ Description: Use Debian's PROJ.4 programs instead of bundled ones
  
  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
index e71137e..85f7c68 100644
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,12 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		--includedir=/usr/include/mbsystem \
 		--docdir=/usr/share/doc/mbsystem/docs \
-		--with-gmt-include=/usr/include/gmt
+		--with-gmt-include=/usr/include/gmt \
+		$(shell dpkg-buildflags --export=configure)
+
+# 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mbsystem.git