[code-saturne] 02/07: Prepare getting source code from upstream SVN repo

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository code-saturne.

commit 0ea0254dc8faa8cfe36b8cf91592bda01735d246
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Jan 19 10:06:59 2015 +0100

    Prepare getting source code from upstream SVN repo
---
 debian/orig-tar.exclude |  0
 debian/orig-tar.sh      | 64 +++++++++++++++++++++++++++++++++----------------
 debian/watch            |  6 +++--
 3 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
new file mode 100644
index 0000000..e69de29
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 348e39e..d1e6a35 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,21 +1,43 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-DIR=code_saturne-$2
-DIRTARGET=code-saturne-$2
-TAR=../code-saturne_$2.orig.tar.bz2
-
-# clean up the upstream tarball
-unzip $3
-mv $DIR $DIRTARGET
-tar -c -j -f $TAR $DIRTARGET
-rm -rf $DIRTARGET $3
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-    . .svn/deb-layout
-    mv $TAR $origDir
-    echo "moved $TAR to $origDir"
-fi
-
-exit 0
+#!/bin/sh
+# Called from uscan with parameters:
+# --upstream-version <release> <path-to-upstream.orig.tar.gz>
+#
+# Require svn
+set -e
+
+UPSTREAM_VERSION="$2"
+UPSTREAM_VERSION_SVN="$UPSTREAM_VERSION+svn"
+UPSTREAM_SVN_TAG=V"$(echo "$UPSTREAM_VERSION" | sed 's/\./_/g')"
+UPSTREAM_SVN_URI="http://code-saturne.org/svn/saturne/tags/$UPSTREAM_SVN_TAG"
+PACKAGE=$(basename "$3" "_$UPSTREAM_VERSION.orig.tar.gz")
+
+SOURCE_DIR="$PACKAGE-$UPSTREAM_VERSION"
+DEBIAN_SOURCE_DIR="$PACKAGE-$UPSTREAM_VERSION_SVN"
+TAR="../${PACKAGE}_$UPSTREAM_VERSION_SVN.orig.tar.gz"
+CPPLUS_RM_NAME=cpplus_RM
+
+# SVN export
+echo "-- Exporting from SVN tag $UPSTREAM_SVN_TAG:"
+/usr/bin/svn export "$UPSTREAM_SVN_URI" "$SOURCE_DIR"
+
+# ChangeLog (snippet from Makefile.am)
+CLDATE=$(LANG=C svn info "$UPSTREAM_SVN_URI" | awk '/^Last Changed Date:/{print $4}')
+today=`date -d "$CLDATE" +%F`
+start=`date -d "$CLDATE" +%Y`-01-01
+/usr/bin/svn2cl --reparagraph --include-rev --include-actions \
+  --authors=${SOURCE_DIR}/extras/changelog/authors.xml \
+  --output=${SOURCE_DIR}/ChangeLog \
+  "$UPSTREAM_SVN_URI" --revision {"${today} 23:59"}:{"${start} 00:00"}
+
+# rename upstream source dir
+# excluding files matched by debian/orig-tar.exclude
+tar c -X debian/orig-tar.exclude "$SOURCE_DIR" | tar x --transform "s,^$SOURCE_DIR,$DEBIAN_SOURCE_DIR,"
+
+# remove empty directories
+find "$DEBIAN_SOURCE_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"
+
+echo "$PACKAGE: downloaded upstream release $2 from SVN and renamed archive to $(basename "$TAR")"
diff --git a/debian/watch b/debian/watch
index cf751bd..4937b7c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,5 @@
 version=3
-http://code-saturne.org/releases/ \
-code_saturne-([0-9.]*)\.tar\.gz
+opts="dversionmangle=s/\+svn\d*$//" \
+	http://code-saturne.org/releases/ \
+	code_saturne-([0-9.]*)\.tar\.gz \
+	debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/code-saturne.git