[bsaf] 06/06: Replaced debian/bsaf-get-orig-source with debian/orig-tar.sh Use XZ compression for the upstream tarball

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository bsaf.

commit d7a09c250926b345a791bcd1aef3dd4c0ff90e4e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 26 14:39:01 2014 +0100

    Replaced debian/bsaf-get-orig-source with debian/orig-tar.sh
    Use XZ compression for the upstream tarball
---
 debian/bsaf-get-orig-source | 45 ---------------------------------------------
 debian/changelog            |  2 ++
 debian/orig-tar.sh          | 17 +++++++++++++++++
 debian/watch                |  2 +-
 4 files changed, 20 insertions(+), 46 deletions(-)

diff --git a/debian/bsaf-get-orig-source b/debian/bsaf-get-orig-source
deleted file mode 100755
index 1dc3318..0000000
--- a/debian/bsaf-get-orig-source
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# This script is used to download the upstream source for bsaf
-# and generate it into an orig source tarball for Debian.
-
-# Common variables used to ease maintenance of this script
-BSAF_VERSION="1.9"
-SVN_REVISION="174"
-
-USAGE="\n\
-This script is used to generate the orig tarball used in building\n\
-Debian packages for bsaf-$BSAF_VERSION.\n\
-Usage: bsaf-get-orig-source [OPTION]\n\
-\n\
- -h, --help                 Display this help message.\n\
- --remove-upstream-source   Remove upstream sources.\n"
-
-while [ "$#" -gt "0" ]
-do
-    case "$1" in
-        --remove-upstream-source)
-            REMOVE_UPSTREAM_SOURCE=1
-            shift
-            ;;
-        -h|--help|*)
-            echo "${USAGE}"
-            exit 1
-            ;;
-    esac
-done
-
-make_current_tarball() {
-    # Download the tarball if it's not available in the current directory
-    [ -d "bsaf-1.9" ] || \
-        svn export -r $SVN_REVISION "https://svn.kenai.com/svn/bsaf~main/framework/tags/bsaf-1.9"
-
-    tar --exclude-vcs -czf "bsaf_$BSAF_VERSION.orig.tar.gz" "bsaf-1.9/"
-    jh_repack --upstream-version $BSAF_VERSION "bsaf_$BSAF_VERSION.orig.tar.gz"
-
-    if [ $REMOVE_UPSTREAM_SOURCE ]; then
-        rm -rf "bsaf-1.9"
-    fi
-}
-
-make_current_tarball
diff --git a/debian/changelog b/debian/changelog
index c293eed..25ae048 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ bsaf (1.9-5) UNRELEASED; urgency=medium
   * Team upload.
   * Build with maven-debian-helper instead of javahelper
   * debian/watch: Added an URL checking the SVN tags
+  * Replaced debian/bsaf-get-orig-source with debian/orig-tar.sh
+  * Use XZ compression for the upstream tarball
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..38bee3b
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../bsaf_$VERSION.orig.tar.xz
+DIR=bsaf-$VERSION
+TAG=bsaf-$VERSION
+
+svn export https://svn.kenai.com/svn/bsaf~main/framework/tags/$TAG $DIR
+tar -c -J -f $TAR --exclude '*.jar' $DIR
+rm -rf $DIR ../$TAG $3
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi
diff --git a/debian/watch b/debian/watch
index c9dfe54..8137ef1 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-https://svn.kenai.com/svn/bsaf~main/framework/tags/ bsaf-([\d\.]+)/
+https://svn.kenai.com/svn/bsaf~main/framework/tags/ bsaf-([\d\.]+)/ debian debian/orig-tar.sh

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