[netcdf] 02/02: towards proper docs installation

[Nico Schlömer]

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

nschloe-guest pushed a commit to branch split-c-f-cxx
in repository netcdf.

commit d0211c19f1afcf6d4ea80a72f91928ca362e8802
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date:   Tue May 20 12:47:57 2014 +0200

    towards proper docs installation
---
 debian/control                | 2 +-
 debian/libcf0.dirs            | 1 -
 debian/libnetcdf-dev.manpages | 2 --
 debian/libnetcdfc7.dirs       | 2 +-
 debian/netcdf-bin.manpages    | 2 ++
 debian/rules                  | 4 ++--
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index a2e3ea5..f6c3ed2 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,7 @@ Section: debug
 Priority: extra
 Architecture: any
 Depends: libnetcdfc7 (= ${binary:Version}), libnetcdff5 (= ${binary:Version}),
- libnetcdfc++4 (= ${binary:Version}), libcf0 (= ${binary:Version}), ${misc:Depends}
+ libnetcdfc++4 (= ${binary:Version}), ${misc:Depends}
 Suggests: gdb
 Description: debugging symbols for NetCDF
  This package contains the files that make it possible to debug the
diff --git a/debian/libcf0.dirs b/debian/libcf0.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libcf0.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libnetcdf-dev.manpages b/debian/libnetcdf-dev.manpages
index 92c30ea..a4a32cd 100644
--- a/debian/libnetcdf-dev.manpages
+++ b/debian/libnetcdf-dev.manpages
@@ -1,3 +1 @@
 debian/tmp/usr/share/man/man3/netcdf.3
-debian/tmp/usr/share/man/man3/netcdf_f77.3
-debian/tmp/usr/share/man/man3/netcdf_f90.3
diff --git a/debian/libnetcdfc7.dirs b/debian/libnetcdfc7.dirs
index 6845771..7141927 100644
--- a/debian/libnetcdfc7.dirs
+++ b/debian/libnetcdfc7.dirs
@@ -1 +1 @@
-usr/lib
+usr/lib/*/
diff --git a/debian/netcdf-bin.manpages b/debian/netcdf-bin.manpages
index e857e80..9e65469 100644
--- a/debian/netcdf-bin.manpages
+++ b/debian/netcdf-bin.manpages
@@ -1,2 +1,4 @@
+debian/tmp/usr/share/man/man1/nccopy.1
 debian/tmp/usr/share/man/man1/ncdump.1
 debian/tmp/usr/share/man/man1/ncgen.1
+debian/tmp/usr/share/man/man1/ncgen3.1
diff --git a/debian/rules b/debian/rules
index 6e032a1..dec59ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ override_dh_auto_configure:
 	-DENABLE_DAP_REMOTE_TESTS:BOOL=OFF \
 	-DENABLE_PARALLEL_TESTS:BOOL=OFF \
 	-DENABLE_TESTS:BOOL=OFF \
-	-DBUILD_DOCS:BOOL=OFF
+	-DBUILD_DOCS:BOOL=ON
 
 #	-DCMAKE_C_COMPILER=mpicc \
 
@@ -37,9 +37,9 @@ install/netcdf-doc::
 	install -d debian/tmp/doc
 	install -d debian/tmp/usr/share/doc/netcdf
 	install -d debian/tmp/usr/share/info
+	install -m 644 -o root -g root $(CURDIR)/man4/*.html debian/tmp/doc/.
 	install -m 644 -o root -g root $(CURDIR)/man4/*.pdf debian/tmp/usr/share/doc/netcdf/.
 	install -m 644 -o root -g root $(CURDIR)/man4/*.txt debian/tmp/usr/share/doc/netcdf/.
 	install -m 644 -o root -g root $(CURDIR)/man4/*.ps debian/tmp/usr/share/doc/netcdf/.
 	install -m 644 -o root -g root $(CURDIR)/man4/*.info debian/tmp/usr/share/info/.
 
-#	install -m 644 -o root -g root $(CURDIR)/man4/*.html debian/tmp/doc/.

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