The following commit has been merged in the master branch:
commit fb35f94b442fe41b8f1bf67b6f5e490ebace3fd1
Author: Gilles Filippini <p...@debian.org>
Date: Tue Jan 7 16:21:50 2014 +0100
Improve the template mechanism for debhelper files.
diff --git a/debian/changelog b/debian/changelog
index 95b96cd..4ccf370 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ hdf5 (1.8.12-4) UNRELEASED; urgency=medium
* Remove Pre-Depends for dummy transitional packages.
* Use dh_autoreconf{,_clean} to ease autotools files patching.
* Refresh patch soname.diff accordingly.
+ * Improve the template based mechanism for debhelper files.
-- Gilles Filippini <p...@debian.org> Tue, 07 Jan 2014 11:10:16 +0100
diff --git a/debian/install_mpidevlib b/debian/install_mpidevlib
deleted file mode 100644
index 7e8b822..0000000
--- a/debian/install_mpidevlib
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/h5pcc
-usr/bin/h5pfc
diff --git a/debian/install_shlib b/debian/install_shlib
deleted file mode 100644
index b21c2f2..0000000
--- a/debian/install_shlib
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libhdf5*.so.*
diff --git a/debian/libhdf5-cpp-7.install b/debian/libhdf5-cpp-7.install
deleted file mode 100644
index 8a2b5ef..0000000
--- a/debian/libhdf5-cpp-7.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libhdf5_cpp.so.7*
-usr/lib/*/libhdf5_hl_cpp.so.7*
diff --git a/debian/libhdf5-flavor-cpp-soname.install.in
b/debian/libhdf5-flavor-cpp-soname.install.in
new file mode 100644
index 0000000..60789a2
--- /dev/null
+++ b/debian/libhdf5-flavor-cpp-soname.install.in
@@ -0,0 +1,2 @@
+usr/lib/*/libhdf5_cpp.so.*
+usr/lib/*/libhdf5_hl_cpp.so.*
diff --git a/debian/install_devlib b/debian/libhdf5-flavor-dev.install.in
similarity index 66%
rename from debian/install_devlib
rename to debian/libhdf5-flavor-dev.install.in
index 740ad8f..1c1742b 100644
--- a/debian/install_devlib
+++ b/debian/libhdf5-flavor-dev.install.in
@@ -2,3 +2,5 @@ usr/include
usr/lib/*/libhdf5*.so
usr/lib/*/libhdf5*.settings
usr/lib/*/libhdf5*.a
+@IFMPI@usr/bin/h5pcc
+@IFMPI@usr/bin/h5pfc
diff --git a/debian/docs_shlib b/debian/libhdf5-flavor-soname.doc.in
similarity index 100%
rename from debian/docs_shlib
rename to debian/libhdf5-flavor-soname.doc.in
diff --git a/debian/libhdf5-flavor-soname.install.in
b/debian/libhdf5-flavor-soname.install.in
new file mode 100644
index 0000000..4297e9b
--- /dev/null
+++ b/debian/libhdf5-flavor-soname.install.in
@@ -0,0 +1,4 @@
+usr/lib/*/libhdf5.so.*
+usr/lib/*/libhdf5_hl.so.*
+usr/lib/*/libhdf5_fortran.so.*
+usr/lib/*/libhdf5hl_fortran.so.*
diff --git a/debian/libhdf5-flavor-soname.shlibs.in
b/debian/libhdf5-flavor-soname.shlibs.in
new file mode 100644
index 0000000..2911769
--- /dev/null
+++ b/debian/libhdf5-flavor-soname.shlibs.in
@@ -0,0 +1,5 @@
+libhdf5_fortran @SONAME@ libhdf5-@SONAME@
+libhdf5 @SONAME@ libhdf5-@SONAME@ | libhdf5-openmpi-@SONAME@ |
libhdf5-mpich-@SONAME@
+libhdf5_hl @SONAME@ libhdf5-@SONAME@ | libhdf5-openmpi-@SONAME@ |
libhdf5-mpich-@SONAME@
+libhdf5hl_fortran @SONAME@ libhdf5-@SONAME@ | libhdf5-openmpi-@SONAME@ |
libhdf5-mpich-@SONAME@
+
diff --git a/debian/rules b/debian/rules
index fd14e63..97c329c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ virtpack = $(package)-$(major_version)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifneq (,$(wildcard /usr/share/mpi-default-dev/debian_defaults))
include /usr/share/mpi-default-dev/debian_defaults
@@ -94,21 +94,28 @@ configure: configure-stamp-debian configure-stamp \
$(configure_stamp_openmpi) configure-stamp-mpich
configure-stamp-debian: debian/control.in
- cd debian && for i in *_devlib; do j=`basename $$i _devlib`; \
- cp $$i $(package)-dev.$$j ; \
- cp $$i $(package)-openmpi-dev.$$j ; \
- cp $$i $(package)-mpich-dev.$$j ; \
- done
- cd debian && for i in *_mpidevlib; do j=`basename $$i _mpidevlib`; \
- cat $$i >> $(package)-openmpi-dev.$$j ; \
- cat $$i >> $(package)-mpich-dev.$$j ; \
- done
- cd debian && for i in *_shlib; do j=`basename $$i _shlib`; \
- ln -sf $$i $(serpack).$$j ; \
- ln -sf $$i $(openmpipack).$$j ; \
- ln -sf $$i $(mpichpack).$$j ; \
- done
- sed -e "s/@SONAME@/$(soname)/g" debian/shlibs.in >
debian/$(serpack).shlibs
+ # This loop generates helper files from debian/*.*.in templates
+ cd debian && for file in *.*.in; do \
+ for flavor in serial openmpi mpich; do \
+ helper=`basename $$file .in | sed 's/soname/$(soname)/g'` ; \
+ flavorstr="" ; \
+ ifmpi="#"; \
+ if [ "$$flavor" != "serial" ]; then \
+ if echo "$$helper" | grep -Eq '\-cpp|\.shlibs'; then \
+ continue ; \
+ fi ; \
+ flavorstr="-$$flavor" ; \
+ ifmpi="" ; \
+ fi ; \
+ helper=`echo $$helper | sed 's/-flavor/'$$flavorstr'/'` ; \
+ sed -e 's/@FLAVOR@/'$$flavor'/g' \
+ -e 's/@IFMPI@/'$$ifmpi'/g' \
+ -e 's/@MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
+ -e 's/@SONAME@/$(soname)/g' \
+ $$file >$$helper ; \
+ done ; \
+ done
+ #
mkdir -p m4
dh_autoreconf
touch $@
@@ -178,11 +185,11 @@ clean:
-rm -rf debian/build
-rm -rf debian/build-openmpi
-rm -rf debian/build-mpich
- -find debian -type l | xargs rm -f
grep -v ^\% debian/control.in | sed -e "s/@SONAME@/$(soname)/g" -e
"s/@ARCHS@/$(ARCHS)/" -e "s/@MAJOR_VERSION@/$(major_version)/" > debian/control
dh_autoreconf_clean
rm -rf m4
- dh_clean configure-stamp* build-stamp* install-stamp* debian/*.shlibs
+ -cd debian && rm -f `ls libhdf5-*.install libhdf5-*.shlibs
libhdf5-*.doc | grep -v 'libhdf5-doc'`
+ dh_clean configure-stamp* build-stamp* install-stamp*
install: build prep install-serial $(install_openmpi) install-mpich install-doc
@@ -258,17 +265,17 @@ ifeq ($(build_openmpi),yes)
dh_makeshlibs -p$(openmpipack) -V $(openmpipack) -- -v$(version)
endif
dh_makeshlibs -p$(mpichpack) -V $(mpichpack) -- -v$(version)
- dh_makeshlibs -p$(serpack) -V "$(serpack) | $(virtpack)" -- -v$(version)
+ dh_makeshlibs -p$(serpack) -V $(serpack) -- -v$(version)
dh_makeshlibs -p$(sercpppack) -V $(sercpppack) -- -v$(version)
dh_installdeb $(ARCH_FLAG)
- dh_shlibdeps -p$(serpack) -L$(serpack)
-ldebian/$(serpack)/usr/lib:debian/build/test/.libs
- dh_shlibdeps -p$(sercpppack) -L$(serpack) -ldebian/$(serpack)/usr/lib
- 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
+ dh_shlibdeps -p$(serpack) -L$(serpack) -lusr/lib/$(DEB_HOST_MULTIARCH)
+ dh_shlibdeps -p$(sercpppack) -L$(serpack)
-lusr/lib/$(DEB_HOST_MULTIARCH)
+ dh_shlibdeps -phdf5-tools -L$(serpack) -lusr/lib/$(DEB_HOST_MULTIARCH)
+ dh_shlibdeps -phdf5-helpers -L$(serpack) -lusr/lib/$(DEB_HOST_MULTIARCH)
ifeq ($(build_openmpi),yes)
- dh_shlibdeps -p$(openmpipack) -L$(openmpipack)
-ldebian/$(openmpipack)/usr/lib
+ dh_shlibdeps -p$(openmpipack) -L$(openmpipack)
-lusr/lib/$(DEB_HOST_MULTIARCH)
endif
- dh_shlibdeps -p$(mpichpack) -L$(mpichpack) -ldebian/$(mpichpack)/usr/lib
+ dh_shlibdeps -p$(mpichpack) -L$(mpichpack)
-lusr/lib/$(DEB_HOST_MULTIARCH)
dh_gencontrol $(ARCH_FLAG)
dh_md5sums $(ARCH_FLAG)
dh_builddeb $(ARCH_FLAG)
diff --git a/debian/shlibs.in b/debian/shlibs.in
deleted file mode 100644
index 4e233a3..0000000
--- a/debian/shlibs.in
+++ /dev/null
@@ -1,5 +0,0 @@
-libhdf5_fortran 7 libhdf5-@SONAME@
-libhdf5 7 libhdf5-@SONAME@ | libhdf5-openmpi-@SONAME@ | libhdf5-mpich-@SONAME@
-libhdf5_hl 7 libhdf5-@SONAME@ | libhdf5-openmpi-@SONAME@ |
libhdf5-mpich-@SONAME@
-libhdf5hl_fortran 7 libhdf5-@SONAME@ | libhdf5-openmpi-@SONAME@ |
libhdf5-mpich-@SONAME@
-
--
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
