[SCM] hdf5 branch, master, updated. upstream/1.8.7-125-gce156a8

2012-02-24 Thread Julien Cristau 
The following commit has been merged in the master branch:
commit f4d346b95da043f56cea658eff5cca5b4de9d2f2
Author: Julien Cristau 
Date:   Fri Feb 17 17:42:29 2012 +

Don't require root for debian/rules clean.

diff --git a/debian/changelog b/debian/changelog
index faea207..f049ed4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ hdf5 (1.8.8-7.1) UNRELEASED; urgency=low
 libhdf5-7 symbols file, so the dependency can also be satisfied by the mpi
 packages' Provides.
   * Use DEB_HOST_ARCH instead of DEB_BUILD_ARCH in debian/rules.
+  * Don't require root for debian/rules clean.
 
- -- Julien Cristau   Fri, 17 Feb 2012 17:41:35 +
+ -- Julien Cristau   Fri, 17 Feb 2012 17:42:19 +
 
 hdf5 (1.8.8-7) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 0052081..ccde607 100755
--- a/debian/rules
+++ b/debian/rules
@@ -172,7 +172,6 @@ test: build-stamp
 
 clean: 
test -f debian/control.in
-   dh_testroot
-rm -rf debian/build
-rm -rf debian/build-openmpi
-rm -rf debian/build-mpich2

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

[SCM] hdf5 branch, master, updated. upstream/1.8.7-125-gce156a8

2012-02-24 Thread Julien Cristau 
The following commit has been merged in the master branch:
commit ce156a84d10642bf7c9ada847e4ab96df2819f0b
Author: Julien Cristau 
Date:   Sat Feb 18 12:26:18 2012 +

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index f049ed4..b2516f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hdf5 (1.8.8-7.1) UNRELEASED; urgency=low
+hdf5 (1.8.8-7.1) unstable; urgency=low
 
   * Non-maintainer upload.
   * Stop building the c++ libraries, nothing uses them.  And don't version the
@@ -7,7 +7,7 @@ hdf5 (1.8.8-7.1) UNRELEASED; urgency=low
   * Use DEB_HOST_ARCH instead of DEB_BUILD_ARCH in debian/rules.
   * Don't require root for debian/rules clean.
 
- -- Julien Cristau   Fri, 17 Feb 2012 17:42:19 +
+ -- Julien Cristau   Sat, 18 Feb 2012 12:25:35 +
 
 hdf5 (1.8.8-7) unstable; urgency=low
 

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

[SCM] hdf5 branch, master, updated. upstream/1.8.7-125-gce156a8

2012-02-24 Thread Julien Cristau 
The following commit has been merged in the master branch:
commit beb4e4aa15e5cbd262e86fd4f55c5a38be07e273
Author: Julien Cristau 
Date:   Fri Feb 17 17:42:13 2012 +

Use DEB_HOST_ARCH instead of DEB_BUILD_ARCH in debian/rules.

diff --git a/debian/changelog b/debian/changelog
index 8693d73..faea207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ hdf5 (1.8.8-7.1) UNRELEASED; urgency=low
   * Stop building the c++ libraries, nothing uses them.  And don't version the
 libhdf5-7 symbols file, so the dependency can also be satisfied by the mpi
 packages' Provides.
+  * Use DEB_HOST_ARCH instead of DEB_BUILD_ARCH in debian/rules.
 
- -- Julien Cristau   Fri, 17 Feb 2012 11:36:46 +0100
+ -- Julien Cristau   Fri, 17 Feb 2012 17:41:35 +
 
 hdf5 (1.8.8-7) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 45e9735..0052081 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,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_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 DEFAULT_MPI=$(shell dpkg -s mpi-default-dev | grep Depends | sed "s/Depends: 
lib//" | sed "s/Depends: //" | sed "s/-dev//")
 
@@ -31,19 +31,19 @@ DEFAULT_MPI=$(shell dpkg -s mpi-default-dev | grep Depends 
| sed "s/Depends: lib
 ARCH_FLAG=-s
 ARCHS=alpha armel armhf amd64 i386 ia64 powerpc sparc kfreebsd-i386 
kfreebsd-amd64 hurd-i386
 
-ifeq ($(DEB_BUILD_ARCH),arm)
+ifeq ($(DEB_HOST_ARCH),arm)
 build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),hppa)
+else ifeq ($(DEB_HOST_ARCH),hppa)
 build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),mips)
+else ifeq ($(DEB_HOST_ARCH),mips)
 build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),mipsel)
+else ifeq ($(DEB_HOST_ARCH),mipsel)
 build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),s390)
+else ifeq ($(DEB_HOST_ARCH),s390)
 build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),s390x)
+else ifeq ($(DEB_HOST_ARCH),s390x)
 build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),sh4)
+else ifeq ($(DEB_HOST_ARCH),sh4)
 build_openmpi = no
 else
 build_openmpi = yes

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