[mbsystem] 19/39: cleanup doc install, better handling of upstream changelog

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository mbsystem.

commit 004f14abf30c1ce66e9e252ce332535f0a09f9d6
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Fri Jun 7 03:05:25 2013 +0000

    cleanup doc install, better handling of upstream changelog
---
 debian/changelog             |  2 +-
 debian/mbsystem-doc.dirs     |  3 ++-
 debian/mbsystem-doc.doc-base |  6 +++---
 debian/mbsystem-doc.install  |  4 +++-
 debian/mbsystem.docs         |  1 -
 debian/rules                 | 14 +++++++++-----
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00c969b..f6162cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/mbsystem-doc.dirs b/debian/mbsystem-doc.dirs
index 2a831ed..022ba56 100644
--- a/debian/mbsystem-doc.dirs
+++ b/debian/mbsystem-doc.dirs
@@ -1 +1,2 @@
-usr/share/doc/mbsystem-doc/docs
+usr/share/doc/mbsystem-doc/docs/html
+usr/share/doc/mbsystem-doc/docs/ps
diff --git a/debian/mbsystem-doc.doc-base b/debian/mbsystem-doc.doc-base
index 64f544d..d9a08c3 100644
--- a/debian/mbsystem-doc.doc-base
+++ b/debian/mbsystem-doc.doc-base
@@ -6,8 +6,8 @@ Abstract: This is everything you'll need to know to get
 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
diff --git a/debian/mbsystem-doc.install b/debian/mbsystem-doc.install
index e563cf8..8afdc75 100644
--- a/debian/mbsystem-doc.install
+++ b/debian/mbsystem-doc.install
@@ -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/
diff --git a/debian/mbsystem.docs b/debian/mbsystem.docs
index 22ebafb..8cf08a3 100644
--- a/debian/mbsystem.docs
+++ b/debian/mbsystem.docs
@@ -1,5 +1,4 @@
 AUTHORS
 COPYING
-ChangeLog
 NOTES
 README
diff --git a/debian/rules b/debian/rules
index 5da7df3..6321e2b 100644
--- a/debian/rules
+++ b/debian/rules
@@ -20,14 +20,18 @@ override_dh_auto_configure:
 		--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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mbsystem.git