Author: hamish-guest
Date: 2013-06-02 07:05:12 +0000 (Sun, 02 Jun 2013)
New Revision: 3087
Added:
packages/mbsystem/trunk/debian/mbsystem-doc.doc-base
packages/mbsystem/trunk/debian/mbsystem-doc.links
packages/mbsystem/trunk/debian/patches/system_proj4.patch
Modified:
packages/mbsystem/trunk/debian/changelog
packages/mbsystem/trunk/debian/mbsystem-doc.dirs
packages/mbsystem/trunk/debian/patches/series
Log:
further proj4 and doc install fixes
Modified: packages/mbsystem/trunk/debian/changelog
===================================================================
--- packages/mbsystem/trunk/debian/changelog 2013-06-02 05:25:03 UTC (rev
3086)
+++ packages/mbsystem/trunk/debian/changelog 2013-06-02 07:05:12 UTC (rev
3087)
@@ -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
Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs
===================================================================
--- packages/mbsystem/trunk/debian/mbsystem-doc.dirs 2013-06-02 05:25:03 UTC
(rev 3086)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs 2013-06-02 07:05:12 UTC
(rev 3087)
@@ -1 +1,2 @@
usr/share/doc/mbsystem/docs
+usr/share/doc/mbsystem-doc/docs
Added: packages/mbsystem/trunk/debian/mbsystem-doc.doc-base
===================================================================
--- packages/mbsystem/trunk/debian/mbsystem-doc.doc-base
(rev 0)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.doc-base 2013-06-02
07:05:12 UTC (rev 3087)
@@ -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
Added: packages/mbsystem/trunk/debian/mbsystem-doc.links
===================================================================
--- packages/mbsystem/trunk/debian/mbsystem-doc.links
(rev 0)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.links 2013-06-02 07:05:12 UTC
(rev 3087)
@@ -0,0 +1 @@
+usr/share/doc/mbsystem/docs /usr/share/doc/mbsystem/docs
Modified: packages/mbsystem/trunk/debian/patches/series
===================================================================
--- packages/mbsystem/trunk/debian/patches/series 2013-06-02 05:25:03 UTC
(rev 3086)
+++ packages/mbsystem/trunk/debian/patches/series 2013-06-02 07:05:12 UTC
(rev 3087)
@@ -1,3 +1,4 @@
# patches to apply
#older_autoconf.patch
mbview_makefile.patch
+system_proj4.patch
Added: packages/mbsystem/trunk/debian/patches/system_proj4.patch
===================================================================
--- packages/mbsystem/trunk/debian/patches/system_proj4.patch
(rev 0)
+++ packages/mbsystem/trunk/debian/patches/system_proj4.patch 2013-06-02
07:05:12 UTC (rev 3087)
@@ -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)
+
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
