[SCM] hdf5 branch, upstream, updated. upstream/1.8.4-patch1-79-gbfcb1ff

Francesco Paolo Lovergine frankie at debian.org
Wed Nov 16 10:34:13 UTC 2011


The following commit has been merged in the upstream branch:
commit ab34c57c08d7172be77b2741e364d35da6caaf2a
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Jan 21 13:44:25 2010 +0000

    Fixed documentation installation.

diff --git a/debian/control b/debian/control
index 41bc887..96982c8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2), quilt,
  libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390 !sh4 !m68k], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
- gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+ gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ sharutils
 Standards-Version: 3.8.3
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
diff --git a/debian/control.in b/debian/control.in
index 9b56252..b97cb14 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,8 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2), quilt,
  libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390 !sh4 !m68k], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
- gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+ gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ sharutils
 Standards-Version: 3.8.3
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
diff --git a/debian/libhdf5-doc.install b/debian/libhdf5-doc.install
index 225d5b1..aa2d748 100644
--- a/debian/libhdf5-doc.install
+++ b/debian/libhdf5-doc.install
@@ -1,3 +1,3 @@
-#doc/html /usr/share/doc/libhdf5-doc
+html /usr/share/doc/libhdf5-doc
 examples/*.c /usr/share/doc/libhdf5-doc/examples
 c++/examples/*.{cpp,h5,out} /usr/share/doc/libhdf5-doc/examples/c++
diff --git a/debian/rules b/debian/rules
index 58d66af..a699537 100755
--- a/debian/rules
+++ b/debian/rules
@@ -180,6 +180,7 @@ build-stamp-mpich: configure-stamp-mpich
 clean: unpatch
 	test -f debian/control.in
 	dh_testroot
+	-rm -rf html
 	-rm -rf debian/build-serial
 	-rm -rf debian/build-lam
 	-rm -rf debian/build-openmpi
@@ -225,6 +226,8 @@ install-mpich: build-stamp-mpich
 install-doc:
 	dh_testdir
 	dh_testroot
+	# extract documentation
+	uudecode -o - < debian/html.tgz.uu | tar xzf -
 	dh_install -p$(package)-doc -X Dependencies -X Makefile.in -X CppUserNotes.doc
 
 binary-indep: install-doc

-- 
Hierarchical Data Format 5 (HDF5)



More information about the Pkg-grass-devel mailing list