r3103 - in packages/mbsystem/trunk/debian: . patches

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2013-06-08 00:46:15 +0000 (Sat, 08 Jun 2013)
New Revision: 3103

Modified:
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/mbsystem-doc.dirs
   packages/mbsystem/trunk/debian/mbsystem-doc.install
   packages/mbsystem/trunk/debian/patches/system_proj4.patch
   packages/mbsystem/trunk/debian/rules
Log:
sync patches and doc install to upstream changes

Modified: packages/mbsystem/trunk/debian/changelog
===================================================================
--- packages/mbsystem/trunk/debian/changelog	2013-06-07 03:05:25 UTC (rev 3102)
+++ packages/mbsystem/trunk/debian/changelog	2013-06-08 00:46:15 UTC (rev 3103)
@@ -1,4 +1,4 @@
-mbsystem (5.4.2111-0) UNRELEASED; urgency=low
+mbsystem (5.4.2120-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-07 03:05:25 UTC (rev 3102)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.dirs	2013-06-08 00:46:15 UTC (rev 3103)
@@ -1,2 +1 @@
-usr/share/doc/mbsystem-doc/docs/html
-usr/share/doc/mbsystem-doc/docs/ps
+usr/share/doc/mbsystem-doc/docs

Modified: packages/mbsystem/trunk/debian/mbsystem-doc.install
===================================================================
--- packages/mbsystem/trunk/debian/mbsystem-doc.install	2013-06-07 03:05:25 UTC (rev 3102)
+++ packages/mbsystem/trunk/debian/mbsystem-doc.install	2013-06-08 00:46:15 UTC (rev 3103)
@@ -1,3 +1,2 @@
-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/
+usr/share/doc/mbsystem/html /usr/share/doc/mbsystem-doc/docs/
+usr/share/doc/mbsystem/ps /usr/share/doc/mbsystem-doc/docs/

Modified: packages/mbsystem/trunk/debian/patches/system_proj4.patch
===================================================================
--- packages/mbsystem/trunk/debian/patches/system_proj4.patch	2013-06-07 03:05:25 UTC (rev 3102)
+++ packages/mbsystem/trunk/debian/patches/system_proj4.patch	2013-06-08 00:46:15 UTC (rev 3103)
@@ -28,12 +28,12 @@
  
  lib_LTLIBRARIES = libmbproj.la
  
---- a/src/man/man1/Makefile.am	(revision 2098)
+--- a/src/man/man1/Makefile.am	(revision 2120)
 +++ b/src/man/man1/Makefile.am	(working copy)
 @@ -1,4 +1,4 @@
 -man_MANS = geod.1 \
 +man_MANS = \
- hsdump.1 \
+ mbhsdump.1 \
  mb7k2jstar.1 \
  mb7k2ss.1 \
 @@ -76,7 +76,6 @@
@@ -41,7 +41,7 @@
  mbsystem.1 \
  mbtime.1 \
 -mbvelocitytool.1 \
--proj.1 
+-proj.1
 +mbvelocitytool.1
  
  EXTRA_DIST = $(man_MANS)

Modified: packages/mbsystem/trunk/debian/rules
===================================================================
--- packages/mbsystem/trunk/debian/rules	2013-06-07 03:05:25 UTC (rev 3102)
+++ packages/mbsystem/trunk/debian/rules	2013-06-08 00:46:15 UTC (rev 3103)
@@ -32,6 +32,7 @@
 #	uscan --noconf --destdir=. --download-current-version --rename --verbose
 
 
-# cleaner doc install
-# ps2pdf + pdftk cat all .ps man pages into a single PDF document.
+# PDF doc generation and install:
+# ps2pdf + 'pdftk cat' to combine all .ps man pages into a single
+#  PDF document.
 #  use ReStructured text to PDF or TeX to make the cover page.