[mbsystem] 07/39: split off -data, -dev, -doc pkgs; comment out not-working-yet patch
Andreas Tille
tille at debian.org
Thu Aug 20 08:40:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository mbsystem.
commit 62a2f092cba11362cdc98aaad21baf3f99e25493
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date: Sun Jun 2 05:08:51 2013 +0000
split off -data, -dev, -doc pkgs; comment out not-working-yet patch
---
debian/changelog | 3 ++-
debian/control | 41 +++++++++++++++++++++++++++++++++++-
debian/mbsystem-data.install | 1 +
debian/mbsystem-dev.dirs | 1 +
debian/mbsystem-dev.install | 4 ++++
debian/mbsystem-doc.dirs | 1 +
debian/mbsystem-doc.install | 1 +
debian/mbsystem.install | 3 +++
debian/patches/mbview_makefile.patch | 6 ++++--
debian/patches/series | 2 +-
debian/rules | 3 ++-
debian/watch | 2 +-
12 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ae2e9fb..97662cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index 9a554ba..e3fe0fc 100644
--- a/debian/control
+++ b/debian/control
@@ -15,10 +15,49 @@ Package: mbsystem
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.
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..89b4e7d
--- /dev/null
+++ b/debian/mbsystem-doc.dirs
@@ -0,0 +1 @@
+usr/share/doc/mbsystem/docs
diff --git a/debian/mbsystem-doc.install b/debian/mbsystem-doc.install
new file mode 100644
index 0000000..89b4e7d
--- /dev/null
+++ b/debian/mbsystem-doc.install
@@ -0,0 +1 @@
+usr/share/doc/mbsystem/docs
diff --git a/debian/mbsystem.install b/debian/mbsystem.install
new file mode 100644
index 0000000..579bdeb
--- /dev/null
+++ b/debian/mbsystem.install
@@ -0,0 +1,3 @@
+usr/bin
+usr/lib/*.so.*
+usr/share/man
diff --git a/debian/patches/mbview_makefile.patch b/debian/patches/mbview_makefile.patch
index 30db569..066ca79 100644
--- a/debian/patches/mbview_makefile.patch
+++ b/debian/patches/mbview_makefile.patch
@@ -8,11 +8,13 @@ Description: Add missing GMT includes dir
--- 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
+
diff --git a/debian/patches/series b/debian/patches/series
index ed08ca8..ef60b43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
# patches to apply
-older_autoconf.patch
+#older_autoconf.patch
mbview_makefile.patch
diff --git a/debian/rules b/debian/rules
index b885b0e..3d38fef 100644
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,8 @@ override_dh_autoreconf:
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:
diff --git a/debian/watch b/debian/watch
index 2a326d6..bf33850 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=
+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
More information about the Pkg-grass-devel
mailing list