[h5utils] 17/39: Imported Debian patch 1.12-2

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository h5utils.

commit a5764b93c504c59041a84687405e419f96b60e54
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Nov 4 22:04:55 2009 +0100

    Imported Debian patch 1.12-2
---
 debian/changelog | 11 +++++++++++
 debian/control   |  4 ++--
 debian/rules     |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 850f926..75ba0fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+h5utils (1.12-2) unstable; urgency=low
+
+  * Changed build-dep in libhdf4-dev instead of libhdf4g-dev.
+    (closes: #540400)
+  * Added a versioned build-dep on hdf5 >= 1.8.3 to force rebuilding
+    with a current version of the library.
+  * Now protects quilt pushing.
+    (closes: #538549)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 04 Nov 2009 22:04:55 +0100
+
 h5utils (1.12-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 22caa62..294c917 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>= 7), libhdf5-serial-dev (>= 1.6.5), libz-dev, libpng-dev, hdf5-tools, 
- libhdf4g-dev, libmatheval1-dev, octave3.0-headers, quilt
+Build-Depends: debhelper (>= 7), libhdf5-serial-dev (>= 1.8.3), libz-dev, libpng-dev, hdf5-tools, 
+ libhdf4-dev, libmatheval1-dev, octave3.0-headers, quilt
 Standards-Version: 3.8.2
 Homepage: http://ab-initio.mit.edu/h5utils/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/h5utils/trunk/
diff --git a/debian/rules b/debian/rules
index fba786b..f9e332b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ endif
 
 patch: patch-stamp
 patch-stamp:
-	QUILT_PATCHES=debian/patches quilt push --color=auto -a
+	QUILT_PATCHES=debian/patches quilt push --color=auto -a || [ $$? = 2 ]
 	touch $@
 
 unpatch:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/h5utils.git