r3085 - in packages/mbsystem/trunk/debian: . patches

Sun Jun 2 05:08:52 UTC 2013

Author: hamish-guest
Date: 2013-06-02 05:08:51 +0000 (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/changelog	2013-06-02 02:20:44 UTC (rev 3084)
+++ packages/mbsystem/trunk/debian/changelog	2013-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 <hamish_b yahoo.com>  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.install	2013-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.dirs	2013-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
===================================================================
--- packages/mbsystem/trunk/debian/mbsystem-doc.dirs	                        (rev 0)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs	2013-06-02 05:08:51 UTC (rev 3085)
@@ -0,0 +1 @@
+usr/share/doc/mbsystem/docs

Added: packages/mbsystem/trunk/debian/mbsystem-doc.install
===================================================================
--- packages/mbsystem/trunk/debian/mbsystem-doc.install	                        (rev 0)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.install	2013-06-02 05:08:51 UTC (rev 3085)
@@ -0,0 +1 @@
+usr/share/doc/mbsystem/docs

Added: packages/mbsystem/trunk/debian/mbsystem.install
===================================================================
--- packages/mbsystem/trunk/debian/mbsystem.install	                        (rev 0)
+++ packages/mbsystem/trunk/debian/mbsystem.install	2013-06-02 05:08:51 UTC (rev 3085)
@@ -0,0 +1,3 @@
+usr/bin
+usr/lib/*.so.*
+usr/share/man

Modified: packages/mbsystem/trunk/debian/patches/mbview_makefile.patch
===================================================================
--- packages/mbsystem/trunk/debian/patches/mbview_makefile.patch	2013-06-02 02:20:44 UTC (rev 3084)
+++ packages/mbsystem/trunk/debian/patches/mbview_makefile.patch	2013-06-02 05:08:51 UTC (rev 3085)
@@ -8,11 +8,13 @@
 
 --- a/src/mbview/Makefile.am	(revision 2083)
 +++ b/src/mbview/Makefile.am	(working copy)
-@@ -1,6 +1,6 @@
+@@ -1,7 +1,7 @@
  bin_PROGRAMS = mbgrdviz mbeditviz
  
 -AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@
+-LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@
 +AM_CPPFLAGS = -I.. -I../mbio -I../mbaux @MOTIF_INC_DIR@ @GL_INC_DIR@ @GMT_INC_DIR@
- LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@
++LIBS = @MOTIF_LIB_DIR@ @GL_LIB_DIR@ ${libgmt_LIBS}
  
  include_HEADERS = mbview.h
+ 

Modified: packages/mbsystem/trunk/debian/patches/series
===================================================================
--- packages/mbsystem/trunk/debian/patches/series	2013-06-02 02:20:44 UTC (rev 3084)
+++ packages/mbsystem/trunk/debian/patches/series	2013-06-02 05:08:51 UTC (rev 3085)
@@ -1,3 +1,3 @@
 # patches to apply
-older_autoconf.patch
+#older_autoconf.patch
 mbview_makefile.patch

Modified: packages/mbsystem/trunk/debian/rules
===================================================================
--- packages/mbsystem/trunk/debian/rules	2013-06-02 02:20:44 UTC (rev 3084)
+++ packages/mbsystem/trunk/debian/rules	2013-06-02 05:08:51 UTC (rev 3085)
@@ -22,7 +22,8 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--enable-static=no \
+		--includedir=/usr/include/mbsystem \
+		--docdir=/usr/share/doc/mbsystem/docs \
 		--with-gmt-include=/usr/include/gmt
 
 #todo:

Modified: packages/mbsystem/trunk/debian/watch
===================================================================
--- packages/mbsystem/trunk/debian/watch	2013-06-02 02:20:44 UTC (rev 3084)
+++ packages/mbsystem/trunk/debian/watch	2013-06-02 05:08:51 UTC (rev 3085)
@@ -1,2 +1,2 @@
-version=
+version=3
 ftp://ftp.ldeo.columbia.edu/pub/MB-System/mbsystem-([\d\.]+)\.tar\.gz


