[hdf5] 01/08: Fix orig-tar.sh regarding patch releases

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository hdf5.

commit 708b61ddcb4a1cf97efa83f7af6144fcbff2bd72
Author: Gilles Filippini <pini at debian.org>
Date:   Tue Jun 16 23:02:28 2015 +0200

    Fix orig-tar.sh regarding patch releases
    
    These releases are numbered x.y.z-patchN, but the documentation branch
    is x.y.z.
---
 debian/orig-tar.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 4d1c221..c9f930d 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -6,12 +6,13 @@
 set -e
 
 UPSTREAM_VERSION="$2"
-UPSTREAM_VERSION_DOC="$UPSTREAM_VERSION+docs"
+MANGLED_UPSTREAM_VERSION="$UPSTREAM_VERSION+docs"
+UPSTREAM_DOC_VERSION="${UPSTREAM_VERSION%-patch*}"
 PACKAGE=$(basename "$3" "_$UPSTREAM_VERSION.orig.tar.gz")
 
 SOURCE_DIR="$PACKAGE-$UPSTREAM_VERSION"
-DEBIAN_SOURCE_DIR="$PACKAGE-$UPSTREAM_VERSION_DOC"
-TAR="../${PACKAGE}_$UPSTREAM_VERSION_DOC.orig.tar.gz"
+DEBIAN_SOURCE_DIR="$PACKAGE-$MANGLED_UPSTREAM_VERSION"
+TAR="../${PACKAGE}_$MANGLED_UPSTREAM_VERSION.orig.tar.gz"
 HTML_DIR="$DEBIAN_SOURCE_DIR/html"
 CPPLUS_RM_NAME=cpplus_RM
 
@@ -19,7 +20,7 @@ CPPLUS_RM_NAME=cpplus_RM
 tar xf $3
 
 # get docs
-/usr/bin/svn export https://svn.hdfgroup.uiuc.edu/hdf5doc/branches/hdf5_"$(echo "$UPSTREAM_VERSION" | sed 's/\./_/g')"/html "$SOURCE_DIR/html"
+/usr/bin/svn export https://svn.hdfgroup.uiuc.edu/hdf5doc/branches/hdf5_"$(echo "$UPSTREAM_DOC_VERSION" | sed 's/\./_/g')"/html "$SOURCE_DIR/html"
 
 # rename upstream source dir
 # excluding files matched by debian/orig-tar.exclude

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