The following commit has been merged in the upstream branch:
commit daf9b16865520d5830e39f97991940a4a26495bf
Author: Sylvestre Ledru <sylvestre.le...@scilab.org>
Date:   Sun Aug 21 10:51:15 2011 +0200

    Rename the package + rules

diff --git a/debian/control b/debian/control
index 5d03349..e02515b 100644
--- a/debian/control
+++ b/debian/control
@@ -48,7 +48,7 @@ Package: libhdf5-dev
 Section: libdevel
 Architecture: any
 Depends: libhdf5-7 (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
- ${misc:Depends}, hdf5-helper
+ ${misc:Depends}, hdf5-helpers
 Conflicts: libhdf5-dev
 Suggests: libhdf5-doc
 Description: Hierarchical Data Format 5 (HDF5) - development files - serial 
version
@@ -83,7 +83,7 @@ Section: libdevel
 Priority: extra
 Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 
hurd-i386
 Depends: libhdf5-openmpi-7 (= ${binary:Version}), zlib1g-dev,
- libjpeg-dev, libopenmpi-dev, ${misc:Depends}, hdf5-helper
+ libjpeg-dev, libopenmpi-dev, ${misc:Depends}, hdf5-helpers
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -134,7 +134,7 @@ Section: libdevel
 Priority: extra
 Architecture: any
 Depends: libhdf5-mpich2-7 (= ${binary:Version}), zlib1g-dev,
- libjpeg-dev, libmpich21.0-dev, ${misc:Depends}, hdf5-helper
+ libjpeg-dev, libmpich21.0-dev, ${misc:Depends}, hdf5-helpers
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -187,7 +187,7 @@ Description: Hierarchical Data Format 5 (HDF5) - 
Documentation
  .
  This package contains documentation for HDF5.
 
-Package: hdf5-helper
+Package: hdf5-helpers
 Section: science
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/control.in b/debian/control.in
index 0e74cc2..b3dc211 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -48,7 +48,7 @@ Package: libhdf5-dev
 Section: libdevel
 Architecture: any
 Depends: libhdf5-@SONAME@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev,
- ${misc:Depends}, hdf5-helper
+ ${misc:Depends}, hdf5-helpers
 Conflicts: libhdf5-dev
 Suggests: libhdf5-doc
 Description: Hierarchical Data Format 5 (HDF5) - development files - serial 
version
@@ -83,7 +83,7 @@ Section: libdevel
 Priority: extra
 Architecture: @ARCHS@
 Depends: libhdf5-openmpi-@SONAME@ (= ${binary:Version}), zlib1g-dev,
- libjpeg-dev, libopenmpi-dev, ${misc:Depends}, hdf5-helper
+ libjpeg-dev, libopenmpi-dev, ${misc:Depends}, hdf5-helpers
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -134,7 +134,7 @@ Section: libdevel
 Priority: extra
 Architecture: any
 Depends: libhdf5-mpich2-@SONAME@ (= ${binary:Version}), zlib1g-dev,
- libjpeg-dev, libmpich21.0-dev, ${misc:Depends}, hdf5-helper
+ libjpeg-dev, libmpich21.0-dev, ${misc:Depends}, hdf5-helpers
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -187,7 +187,7 @@ Description: Hierarchical Data Format 5 (HDF5) - 
Documentation
  .
  This package contains documentation for HDF5.
 
-Package: hdf5-helper
+Package: hdf5-helpers
 Section: science
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index 7899a30..330f368 100755
--- a/debian/rules
+++ b/debian/rules
@@ -185,7 +185,7 @@ install-serial: build-stamp
        dh_testroot
        -mkdir debian/build/tmpinst
        $(MAKE) -C debian/build/ install 
prefix=$(CURDIR)/debian/build/tmpinst/usr
-       dh_install -p$(serpack) -p$(package)-dev -phdf5-tools \
+       dh_install -p$(serpack) -p$(package)-dev -phdf5-helpers -phdf5-tools \
                --sourcedir=debian/build/tmpinst
 
 install-openmpi: build-stamp-openmpi
@@ -232,6 +232,7 @@ binary-arch: prep install-serial $(install_openmpi) 
install-mpich2
        dh_installchangelogs -a -k release_docs/RELEASE.txt
        dh_link $(ARCH_FLAG)
        dh_strip -phdf5-tools
+       dh_strip -phdf5-helpers
        dh_strip -p$(serpack) --dbg-package=$(serpack)-dbg
        dh_strip -p$(mpich2pack) --dbg-package=$(mpich2pack)-dbg
 ifeq ($(build_openmpi),yes)
@@ -247,6 +248,7 @@ endif
        dh_installdeb $(ARCH_FLAG)
        dh_shlibdeps -p$(serpack) -L$(serpack) 
-ldebian/$(serpack)/usr/lib:debian/build/test/.libs
        dh_shlibdeps -phdf5-tools -L$(serpack) 
-ldebian/$(serpack)/usr/lib:debian/build/test/.libs 
+       dh_shlibdeps -phdf5-helpers -L$(serpack) 
-ldebian/$(serpack)/usr/lib:debian/build/test/.libs 
 ifeq ($(build_openmpi),yes)
        dh_shlibdeps -p$(openmpipack) -L$(openmpipack) 
-ldebian/$(openmpipack)/usr/lib
 endif

-- 
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

Reply via email to