This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mbsystem.
commit af5033c4895e7c018a4786ae7189e6f5ded2efca Author: M. Hamish Bowman <hamis...@yahoo.com> Date: Sun Jun 2 07:05:12 2013 +0000 further proj4 and doc install fixes --- debian/changelog | 3 ++- debian/mbsystem-doc.dirs | 1 + debian/mbsystem-doc.doc-base | 13 +++++++++ debian/mbsystem-doc.links | 1 + debian/patches/series | 1 + debian/patches/system_proj4.patch | 55 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 73 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 97662cf..8e9e055 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <hamish_b yahoo.com> Sun, 02 Jun 2013 13:09:24 +1200 diff --git a/debian/mbsystem-doc.dirs b/debian/mbsystem-doc.dirs index 89b4e7d..620559a 100644 --- a/debian/mbsystem-doc.dirs +++ b/debian/mbsystem-doc.dirs @@ -1 +1,2 @@ usr/share/doc/mbsystem/docs +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..b217860 --- /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/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 diff --git a/debian/mbsystem-doc.links b/debian/mbsystem-doc.links new file mode 100644 index 0000000..16415a5 --- /dev/null +++ b/debian/mbsystem-doc.links @@ -0,0 +1 @@ +usr/share/doc/mbsystem/docs /usr/share/doc/mbsystem/docs diff --git a/debian/patches/series b/debian/patches/series index ef60b43..11cefb9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ # patches to apply #older_autoconf.patch mbview_makefile.patch +system_proj4.patch diff --git a/debian/patches/system_proj4.patch b/debian/patches/system_proj4.patch new file mode 100644 index 0000000..0033851 --- /dev/null +++ b/debian/patches/system_proj4.patch @@ -0,0 +1,55 @@ +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 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) + -- 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