This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mbsystem.
commit 5d1382043b9165833cba758aa3f7e6ed966a44a2 Author: M. Hamish Bowman <hamis...@yahoo.com> Date: Sat Jun 8 00:46:15 2013 +0000 sync patches and doc install to upstream changes --- debian/changelog | 2 +- debian/mbsystem-doc.dirs | 3 +-- debian/mbsystem-doc.install | 5 ++--- debian/patches/system_proj4.patch | 6 +++--- debian/rules | 5 +++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index f6162cf..f4ae901 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/mbsystem-doc.dirs b/debian/mbsystem-doc.dirs index 022ba56..2a831ed 100644 --- a/debian/mbsystem-doc.dirs +++ b/debian/mbsystem-doc.dirs @@ -1,2 +1 @@ -usr/share/doc/mbsystem-doc/docs/html -usr/share/doc/mbsystem-doc/docs/ps +usr/share/doc/mbsystem-doc/docs diff --git a/debian/mbsystem-doc.install b/debian/mbsystem-doc.install index 8afdc75..d491adc 100644 --- a/debian/mbsystem-doc.install +++ b/debian/mbsystem-doc.install @@ -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/ diff --git a/debian/patches/system_proj4.patch b/debian/patches/system_proj4.patch index 5984b05..a9b5eec 100644 --- a/debian/patches/system_proj4.patch +++ b/debian/patches/system_proj4.patch @@ -28,12 +28,12 @@ Description: Use Debian's PROJ.4 programs instead of bundled ones 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 @@ Description: Use Debian's PROJ.4 programs instead of bundled ones mbsystem.1 \ mbtime.1 \ -mbvelocitytool.1 \ --proj.1 +-proj.1 +mbvelocitytool.1 EXTRA_DIST = $(man_MANS) diff --git a/debian/rules b/debian/rules index 6321e2b..5cfafd9 100644 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,7 @@ override_dh_installchangelogs: # 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. -- 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