[libcofoja-java] 04/12: Replaced debian/get-orig-source.sh with debian/orig-tar.sh

[Emmanuel Bourg]

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

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

commit c81edc84bc474d56a1ebd597189c1562eacae7c6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Apr 14 17:27:53 2014 +0200

    Replaced debian/get-orig-source.sh with debian/orig-tar.sh
---
 debian/changelog          |  3 +++
 debian/get-orig-source.sh | 22 ----------------------
 debian/orig-tar.sh        | 13 +++++++++++++
 debian/watch              |  6 ++----
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67cf19d..1bb0e98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ cofoja (1.0~r139-3) UNRELEASED; urgency=medium
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
   * Switch to debhelper level 9
+  * Replaced debian/get-orig-source.sh with debian/orig-tar.sh
+    and made it work with uscan
+  * Use XZ compression for the upstream tarball
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 14 Apr 2014 16:19:53 +0200
 
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
deleted file mode 100755
index 96a80a4..0000000
--- a/debian/get-orig-source.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-PACKAGE=$(dpkg-parsechangelog | sed -ne 's/^Source: \(.*\)/\1/p')
-SRC_VERSION=$(dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
-SRC_REVISION=$(dpkg-parsechangelog | sed -ne 's/^Version: .*~r\(.*\)-.*/\1/p')
-SRC_DIR=$PACKAGE-$SRC_VERSION.orig
-TARBALL=$PACKAGE'_'$SRC_VERSION'.orig.tar.bz2'
-SVN_REPOS=http://cofoja.googlecode.com/svn
-
-echo "Package: "$PACKAGE
-echo "Version: "$SRC_VERSION
-echo "Revision: "$SRC_REVISION
-echo "Tarball: "$TARBALL
-
-
-rm -rf get-orig-source $TARBALL
-mkdir get-orig-source
-svn export -r $SRC_REVISION $SVN_REPOS/trunk/ get-orig-source/$SRC_DIR
-BZIP2='--best' tar cjf $TARBALL -C get-orig-source $SRC_DIR
-rm -r get-orig-source
-echo "  "$TARBALL" created; move it to the right destination to build the package"
-
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..672fe64
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+VERSION=$2
+PACKAGE=$(dpkg-parsechangelog | sed -ne 's/^Source: \(.*\)/\1/p')
+REVISION=$(echo $VERSION | sed -ne 's/^.*~r\(.*\)/\1/p')
+DIR=$PACKAGE-$VERSION.orig
+TAR=../$PACKAGE'_'$VERSION'.orig.tar.xz'
+SVN_REPOS=http://cofoja.googlecode.com/svn
+
+rm -Rf $3 $DIR
+svn export -r $REVISION http://cofoja.googlecode.com/svn/trunk/ $DIR
+XZ_OPT=--best tar cJvf $TAR $DIR
+rm -rf $DIR
diff --git a/debian/watch b/debian/watch
index abdc5b7..69fa748 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,3 @@
-# Compulsory line, this is a version 3 file
 version=3
-
-http://code.google.com/p/cofoja/downloads/list?can=1 .*/cofoja-(\d[\d.]*[-r\d.]*)\.(?:jar)
-
+options=uversionmangle=s/-(r[0-9]+)/~$1/ \
+http://code.google.com/p/cofoja/downloads/list?can=1 .*/cofoja-(\d[\d.]*[-r\d.]*)\.(?:jar) debian debian/orig-tar.sh

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