The following commit has been merged in the upstream branch: commit b15f17434796295c7bc5ce97c456b7918f600917 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Fri Feb 25 10:00:15 2011 +0100
Fixating for source 3.0 and some lintian warnings. diff --git a/debian/changelog b/debian/changelog index f40a886..be2b550 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +hdf5 (1.8.4-patch1-3) unstable; urgency=low + + * Moved repository to git and changed Vcs-* fields. + * Now using source format 3.0 and removed quilt build-dep. + * Policy bumped to 3.9.1, no changes required. + * Added ${misc:Depends} to all binary package due to dh use. + + -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 25 Feb 2011 09:47:32 +0100 + hdf5 (1.8.4-patch1-2) unstable; urgency=low [ Adam C. Powell, IV ] diff --git a/debian/control b/debian/control index 2eefaed..ecfc391 100644 --- a/debian/control +++ b/debian/control @@ -3,19 +3,19 @@ Section: science Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2), quilt, +Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2), 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 !sh4], sharutils, mpi-default-dev -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Homepage: http://hdfgroup.org/HDF5/ -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/hdf5/trunk +Vcs-Browser: http://git.debian.org/?p=pkg-grass/hdf5.git +Vcs-Git: git://git.debian.org/git/pkg-grass/hdf5.git Package: libhdf5-serial-1.8.4 Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-1.8.3 Provides: libhdf5-1.8.4, libhdf5-1.8 Replaces: libhdf5-1.8.3 @@ -30,7 +30,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version Package: libhdf5-serial-dev Section: libdevel Architecture: any -Depends: libhdf5-serial-1.8.4 (= ${binary:Version}), zlib1g-dev, libjpeg-dev +Depends: libhdf5-serial-1.8.4 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, ${misc:Depends} Conflicts: libhdf5-dev Provides: libhdf5-dev Suggests: libhdf5-doc @@ -46,7 +46,7 @@ Package: libhdf5-lam-1.8.4 Section: libs Priority: extra Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-1.8.3 Provides: libhdf5-1.8.4, libhdf5-1.8 Replaces: libhdf5-1.8.3 @@ -62,7 +62,7 @@ Package: libhdf5-lam-dev Section: libdevel Priority: extra Architecture: any -Depends: libhdf5-lam-1.8.4 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, lam4-dev +Depends: libhdf5-lam-1.8.4 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, lam4-dev, ${misc:Depends} Conflicts: libhdf5-dev Provides: libhdf5-dev Suggests: libhdf5-doc @@ -78,7 +78,7 @@ Package: libhdf5-openmpi-1.8.4 Section: libs Priority: extra Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-1.8.3 Provides: libhdf5-1.8.4, libhdf5-1.8 Replaces: libhdf5-1.8.3 @@ -94,7 +94,7 @@ Package: libhdf5-openmpi-dev Section: libdevel Priority: extra Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 -Depends: libhdf5-openmpi-1.8.4 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libopenmpi-dev +Depends: libhdf5-openmpi-1.8.4 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libopenmpi-dev, ${misc:Depends} Conflicts: libhdf5-dev Provides: libhdf5-dev Suggests: libhdf5-doc @@ -110,7 +110,7 @@ Package: libhdf5-mpich-1.8.4 Section: libs Priority: extra Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-1.8.3 Provides: libhdf5-1.8.4, libhdf5-1.8 Replaces: libhdf5-1.8.3 @@ -127,7 +127,7 @@ Package: libhdf5-mpich-dev Section: libdevel Priority: extra Architecture: any -Depends: libhdf5-mpich-1.8.4 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libmpich1.0-dev +Depends: libhdf5-mpich-1.8.4 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libmpich1.0-dev, ${misc:Depends} Conflicts: libhdf5-dev Provides: libhdf5-dev Suggests: libhdf5-doc @@ -144,7 +144,7 @@ Package: libhdf5-mpi-dev Section: libdevel Priority: extra Architecture: any -Depends: ${hdf5-mpi-dev}, mpi-default-dev +Depends: ${hdf5-mpi-dev}, mpi-default-dev, ${misc:Depends} Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH version HDF5 is a file format and library for storing scientific data. HDF5 was designed and implemented to address the deficiencies of @@ -156,6 +156,7 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH versi Package: libhdf5-doc Section: doc Architecture: all +Depends: ${misc:Depends} Suggests: libhdf5-dev, www-browser, pdf-viewer, doc-base Description: Hierarchical Data Format 5 (HDF5) - Documentation HDF5 is a file format and library for storing scientific data. @@ -168,7 +169,7 @@ Description: Hierarchical Data Format 5 (HDF5) - Documentation Package: hdf5-tools Section: science Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Hierarchical Data Format 5 (HDF5) - Runtime tools HDF5 is a file format and library for storing scientific data. HDF5 was designed and implemented to address the deficiencies of diff --git a/debian/control.in b/debian/control.in index 99d1372..82eef2b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,19 +3,19 @@ Section: science Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2), quilt, +Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2), 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 !sh4], sharutils, mpi-default-dev -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Homepage: http://hdfgroup.org/HDF5/ -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/hdf5/trunk +Vcs-Browser: http://git.debian.org/?p=pkg-grass/hdf5.git +Vcs-Git: git://git.debian.org/git/pkg-grass/hdf5.git Package: libhdf5-serial-@VERSION@ Section: libs Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, libhdf5-1.8.3 Provides: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@ Replaces: libhdf5-1.8.3 @@ -30,7 +30,7 @@ Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version Package: libhdf5-serial-dev Section: libdevel Architecture: any -Depends: libhdf5-serial-@VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev +Depends: libhdf5-serial-@VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev, ${misc:Depends} Conflicts: libhdf5-dev Provides: libhdf5-dev Suggests: libhdf5-doc @@ -46,7 +46,7 @@ Package: libhdf5-lam-@VERSION@ Section: libs Priority: extra Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, libhdf5-1.8.3 Provides: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@ Replaces: libhdf5-1.8.3 @@ -62,7 +62,7 @@ Package: libhdf5-lam-dev Section: libdevel Priority: extra Architecture: any -Depends: libhdf5-lam-@VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, lam4-dev +Depends: libhdf5-lam-@VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, lam4-dev, ${misc:Depends} Conflicts: libhdf5-dev Provides: libhdf5-dev Suggests: libhdf5-doc @@ -78,7 +78,7 @@ Package: libhdf5-openmpi-@VERSION@ Section: libs Priority: extra Architecture: @ARCHS@ -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, libhdf5-1.8.3 Provides: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@ Replaces: libhdf5-1.8.3 @@ -94,7 +94,7 @@ Package: libhdf5-openmpi-dev Section: libdevel Priority: extra Architecture: @ARCHS@ -Depends: libhdf5-openmpi-@VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libopenmpi-dev +Depends: libhdf5-openmpi-@VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libopenmpi-dev, ${misc:Depends} Conflicts: libhdf5-dev Provides: libhdf5-dev Suggests: libhdf5-doc @@ -110,7 +110,7 @@ Package: libhdf5-mpich-@VERSION@ Section: libs Priority: extra Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@, libhdf5-1.8.3 Provides: libhdf5-@VERSION@, libhdf5-@MAJOR_VERSION@ Replaces: libhdf5-1.8.3 @@ -127,7 +127,7 @@ Package: libhdf5-mpich-dev Section: libdevel Priority: extra Architecture: any -Depends: libhdf5-mpich-@VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libmpich1.0-dev +Depends: libhdf5-mpich-@VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libmpich1.0-dev, ${misc:Depends} Conflicts: libhdf5-dev Provides: libhdf5-dev Suggests: libhdf5-doc @@ -144,7 +144,7 @@ Package: libhdf5-mpi-dev Section: libdevel Priority: extra Architecture: any -Depends: ${hdf5-mpi-dev}, mpi-default-dev +Depends: ${hdf5-mpi-dev}, mpi-default-dev, ${misc:Depends} Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH version HDF5 is a file format and library for storing scientific data. HDF5 was designed and implemented to address the deficiencies of @@ -156,6 +156,7 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH versi Package: libhdf5-doc Section: doc Architecture: all +Depends: ${misc:Depends} Suggests: libhdf5-dev, www-browser, pdf-viewer, doc-base Description: Hierarchical Data Format 5 (HDF5) - Documentation HDF5 is a file format and library for storing scientific data. @@ -168,7 +169,7 @@ Description: Hierarchical Data Format 5 (HDF5) - Documentation Package: hdf5-tools Section: science Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Hierarchical Data Format 5 (HDF5) - Runtime tools HDF5 is a file format and library for storing scientific data. HDF5 was designed and implemented to address the deficiencies of diff --git a/debian/rules b/debian/rules index 3c580a9..6cba9ba 100755 --- a/debian/rules +++ b/debian/rules @@ -24,15 +24,6 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) DEFAULT_MPI=$(shell readlink /etc/alternatives/mpi | sed s/usr//g | sed s/include//g | sed s/lib//g | sed s/\\///g) -patch: patch-stamp -patch-stamp: - QUILT_PATCHES=debian/patches quilt push --color=auto -a || [ $$? = 2 ] - touch patch-stamp - -unpatch: - QUILT_PATCHES=debian/patches quilt pop -a || true - rm -rf .pc patch-stamp - # To be used if binary packages were buildable on any arch #ARCH_FLAG=-a #ARCHS=any @@ -101,10 +92,10 @@ CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \ --disable-sharedlib-rpath --with-zlib --with-default-api-version=v16 SERIAL_ONLY_FLAGS = --enable-cxx --enable-fortran --enable-threadsafe -configure: patch configure-stamp-debian configure-stamp-serial configure-stamp-lam \ +configure: configure-stamp-debian configure-stamp-serial configure-stamp-lam \ $(configure_stamp_openmpi) configure-stamp-mpich -configure-stamp-debian: patch debian/control.in +configure-stamp-debian: debian/control.in cd debian && for i in *_devlib; do j=`basename $$i _devlib`; \ ln -sf $$i $(package)-serial-dev.$$j ; \ ln -sf $$i $(package)-lam-dev.$$j ; \ @@ -191,7 +182,7 @@ build-stamp-mpich: configure-stamp-mpich test: build-stamp-serial $(MAKE) -C debian/build-serial/ test -clean: unpatch +clean: test -f debian/control.in dh_testroot -rm -rf html diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- Hierarchical Data Format 5 (HDF5) _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel