[animal-sniffer] 04/04: 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 animal-sniffer.

commit 31e04ec346bc137969b746e16a338b1a4a62e757
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 29 17:15:49 2014 +0200

    Use XZ compression for the upstream tarball
---
 debian/changelog   |  1 +
 debian/orig-tar.sh | 17 +++++++++++++++++
 debian/rules       | 24 ++++++------------------
 debian/watch       |  2 +-
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf8fca9..db603b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ animal-sniffer (1.7-3) UNRELEASED; urgency=low
   * Use canonical URLs for the Vcs-* fields
   * Added a watch file
   * Switch to debhelper level 9
+  * Use XZ compression for the upstream tarball
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 19 Jun 2013 10:55:04 +0200
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..fc1e7d8
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../animal-sniffer_$VERSION.orig.tar.xz
+DIR=animal-sniffer-$VERSION
+TAG=animal-sniffer-parent-$VERSION
+
+svn export https://svn.codehaus.org/mojo/tags/$TAG $DIR
+XZ_OPT=--best 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/rules b/debian/rules
index 0a055a9..d5ba014 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,31 +3,19 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
-#binary-post-install/lib$(PACKAGE)-java::
-#	mh_installpoms -plib$(PACKAGE)-java
-#	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar 
+JAVA_HOME := /usr/lib/jvm/default-java
 
 DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
 DEB_MAVEN_BUILD_TARGET := install
 
+#binary-post-install/lib$(PACKAGE)-java::
+#	mh_installpoms -plib$(PACKAGE)-java
+#	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar 
+
 clean::
 	mh_clean
 	-rm mvn-build
 	-rm -r debian/null
 
-JAVA_HOME := /usr/lib/jvm/default-java
-
-# Adapted from http://wiki.debian.org/SandroTosi/Svn_get-orig-source
-PACKAGE = animal-sniffer-parent
-SRC_VERSION := 1.6
-TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
 get-orig-source:
-	rm -rf get-orig-source $(TARBALL)
-	mkdir get-orig-source
-	svn export https://svn.codehaus.org/mojo/tags/animal-sniffer-parent-$(SRC_VERSION)/ \
-	get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig
-	GZIP='--best --no-name' tar czf $(TARBALL) -C get-orig-source $(PACKAGE)-$(SRC_VERSION).orig
-	rm -rf get-orig-source
-	echo "  "$(TARBALL)" created; move it to the right destination to build the package"
-
-
+	uscan --download-current-version --force-download --no-symlink
diff --git a/debian/watch b/debian/watch
index 07adc52..b3e4186 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-https://svn.codehaus.org/mojo/tags/ .*animal-sniffer-parent-([\d\.]+)/
+https://svn.codehaus.org/mojo/tags/ .*animal-sniffer-parent-([\d\.]+)/ debian debian/orig-tar.sh

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