r3102 - packages/mbsystem/trunk/debian

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2013-06-07 03:05:25 +0000 (Fri, 07 Jun 2013)
New Revision: 3102

Modified:
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/mbsystem-doc.dirs
   packages/mbsystem/trunk/debian/mbsystem-doc.doc-base
   packages/mbsystem/trunk/debian/mbsystem-doc.install
   packages/mbsystem/trunk/debian/mbsystem.docs
   packages/mbsystem/trunk/debian/rules
Log:
cleanup doc install, better handling of upstream changelog

Modified: packages/mbsystem/trunk/debian/changelog
===================================================================
--- packages/mbsystem/trunk/debian/changelog	2013-06-06 03:45:50 UTC (rev 3101)
+++ packages/mbsystem/trunk/debian/changelog	2013-06-07 03:05:25 UTC (rev 3102)
@@ -1,4 +1,4 @@
-mbsystem (5.4.2098-0) UNRELEASED; urgency=low
+mbsystem (5.4.2111-0) UNRELEASED; urgency=low
 
   * Initial packaging incorporating upstream support for shared libs
   * Split off -dev, -doc, -data packages

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.dirs
===================================================================
--- packages/mbsystem/trunk/debian/mbsystem-doc.dirs	2013-06-06 03:45:50 UTC (rev 3101)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs	2013-06-07 03:05:25 UTC (rev 3102)
@@ -1 +1,2 @@
-usr/share/doc/mbsystem-doc/docs
+usr/share/doc/mbsystem-doc/docs/html
+usr/share/doc/mbsystem-doc/docs/ps

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.doc-base
===================================================================
--- packages/mbsystem/trunk/debian/mbsystem-doc.doc-base	2013-06-06 03:45:50 UTC (rev 3101)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.doc-base	2013-06-07 03:05:25 UTC (rev 3102)
@@ -6,8 +6,8 @@
 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
+Index: /usr/share/doc/mbsystem-doc/docs/html/index.html
+Files: /usr/share/doc/mbsystem-doc/docs/html/*.html /usr/share/doc/mbsystem-doc/docs/html/*.gif
 
 Format: PostScript
-Files: /usr/share/doc/mbsystem-doc/docs/*.ps.gz
+Files: /usr/share/doc/mbsystem-doc/docs/ps/*.ps.gz

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.install
===================================================================
--- packages/mbsystem/trunk/debian/mbsystem-doc.install	2013-06-06 03:45:50 UTC (rev 3101)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.install	2013-06-07 03:05:25 UTC (rev 3102)
@@ -1 +1,3 @@
-usr/share/doc/mbsystem/docs /usr/share/doc/mbsystem-doc
+usr/share/doc/mbsystem/docs/*.html /usr/share/doc/mbsystem-doc/docs/html/
+usr/share/doc/mbsystem/docs/*.gif /usr/share/doc/mbsystem-doc/docs/html/
+usr/share/doc/mbsystem/docs/*.ps /usr/share/doc/mbsystem-doc/docs/ps/

Modified: packages/mbsystem/trunk/debian/mbsystem.docs
===================================================================
--- packages/mbsystem/trunk/debian/mbsystem.docs	2013-06-06 03:45:50 UTC (rev 3101)
+++ packages/mbsystem/trunk/debian/mbsystem.docs	2013-06-07 03:05:25 UTC (rev 3102)
@@ -1,5 +1,4 @@
 AUTHORS
 COPYING
-ChangeLog
 NOTES
 README

Modified: packages/mbsystem/trunk/debian/rules
===================================================================
--- packages/mbsystem/trunk/debian/rules	2013-06-06 03:45:50 UTC (rev 3101)
+++ packages/mbsystem/trunk/debian/rules	2013-06-07 03:05:25 UTC (rev 3102)
@@ -20,14 +20,18 @@
 		--docdir=/usr/share/doc/mbsystem/docs \
 		--with-gmt-include=/usr/include/gmt
 
-#todo:
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
+
+
+# problematic: the upstream tarball is officially "pkg-latest.tar.gz",
+#  which is then symlinked to an exact pkg-x.y.svn_rev.tar.gz filename.
+#  but sometimes there are newer x.y.svn_rev versions there for testing,
+#  so we can't rely on the biggest number there being a real release.
 #get-orig-source:
 #	uscan --noconf --destdir=. --download-current-version --rename --verbose
 
 
 # cleaner doc install
-# install --mode=644 html /usr/share/doc/mbsystem-doc/html
-# install --mode=644 ps /usr/share/doc/mbsystem-doc/ps
 # ps2pdf + pdftk cat all .ps man pages into a single PDF document.
-#   see the osgeolive mb-system build script for the code.
-
+#  use ReStructured text to PDF or TeX to make the cover page.