This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository hdf5.
commit 55489403f41c162a666ccb103b83229e275d8b3f
Author: Gilles Filippini <p...@debian.org>
Date: Sun Jan 14 14:39:32 2018 +0100
Fix debian/watch and prepare import of upstream release 1.10.1+repack
---
debian/changelog | 4 +++-
debian/orig-tar.exclude | 1 +
debian/orig-tar.sh | 11 ++++++-----
debian/watch | 9 ++++-----
4 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index df9351c..cf45a14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-hdf5 (1.10.1+docs-1~exp3) UNRELEASED; urgency=medium
+hdf5 (1.10.1+repack-1~exp1) UNRELEASED; urgency=medium
+ * Fix broken debian/watch due to upstrem web site major change; the
+ uscan download mode is now set to git
* Disable dh_auto_test on ppc64el (HDFFV-10309)
* This upstream release fixes openmpi flavor on arm64 (closes: #855810)
* Priority: replace 'extra' with 'optional'
diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
index 0ba464d..6163353 100644
--- a/debian/orig-tar.exclude
+++ b/debian/orig-tar.exclude
@@ -1,3 +1,4 @@
+.git*
html/PSandPDF
html/Specifications
html/HL/Examples
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 717b526..2fd908e 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,17 +1,18 @@
#!/bin/sh
# Called from uscan with parameters:
-# --upstream-version <release> <path-to-upstream.orig.tar.gz>
+# --upstream-version <release>
#
# Require git
set -e
UPSTREAM_VERSION="$2"
-MANGLED_UPSTREAM_VERSION="$(echo "$UPSTREAM_VERSION" | sed
's/-\(alpha\|pre\)/~\1/')+docs"
+MANGLED_UPSTREAM_VERSION="$(echo "$UPSTREAM_VERSION" | sed
's/-\(alpha\|pre\)/~\1/')+repack"
UPSTREAM_DOC_VERSION="${UPSTREAM_VERSION%-*}"
if [ "$UPSTREAM_DOC_VERSION" = 1.10.0 ]; then
UPSTREAM_DOC_VERSION=1.10
fi
-PACKAGE=$(basename "$3" "_$UPSTREAM_VERSION.orig.tar.gz")
+PACKAGE=hdf5
+DOWNLOADED_TARBALL=../${PACKAGE}_${UPSTREAM_VERSION}.orig.tar.gz
SOURCE_DIR="$PACKAGE-$UPSTREAM_VERSION"
DEBIAN_SOURCE_DIR="$PACKAGE-$MANGLED_UPSTREAM_VERSION"
@@ -19,7 +20,7 @@ TAR="../${PACKAGE}_$MANGLED_UPSTREAM_VERSION.orig.tar.gz"
HTML_DIR="$DEBIAN_SOURCE_DIR/html"
# extract the upstream archive
-tar xf $3
+tar xf $DOWNLOADED_TARBALL
# get docs
git clone --depth 1 --single-branch --branch hdf5_"$(echo
"$UPSTREAM_DOC_VERSION" | sed 's/\./_/g')"
https://bitbucket.hdfgroup.org/scm/hdffv/hdf5doc.git
@@ -35,6 +36,6 @@ find "$HTML_DIR" -type d -empty -delete
# repack into orig.tar.gz
tar -c -z -f "$TAR" "$DEBIAN_SOURCE_DIR/"
-rm -rf "$SOURCE_DIR" "$DEBIAN_SOURCE_DIR" "$3"
+rm -rf "$SOURCE_DIR" "$DEBIAN_SOURCE_DIR" "$(readlink -f
"$DOWNLOADED_TARBALL")" "$DOWNLOADED_TARBALL" ../${PACKAGE}.[1-9]*.git
echo "$PACKAGE: downloaded docs and renamed archive to $(basename "$TAR")"
diff --git a/debian/watch b/debian/watch
index 930e239..a32764a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,4 @@
-version=3
-opts="dversionmangle=s/\+docs\d*$//;s/~(alpha|pre)/-\\1/,dirversionmangle=s/-(alpha|pre)/~\\1/"
\
- ftp://ftp.hdfgroup.org/HDF5/releases/hdf5-(.*)/hdf5-(.*)/src/ \
- hdf5-(.*).tar.gz \
- debian debian/orig-tar.sh
+version=4
+opts="mode=git, pgpmode=none, compression=gz,
dversionmangle=s/\+(docs|repack)\d*$//;s/~(alpha|pre)/-\\1/,
uversionmangle=s/_/./g" \
+ https://bitbucket.hdfgroup.org/scm/hdffv/hdf5.git \
+ refs/tags/hdf5-([\d_]+) debian debian/orig-tar.sh
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/hdf5.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
