[libspring-java] 02/02: Remove more jar files from 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 libspring-java.

commit 1740c036f72d178a347c857301f1b835c0246a45
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 26 15:44:18 2014 +0100

    Remove more jar files from the upstream tarball
---
 debian/changelog        |  1 +
 debian/orig-tar.exclude |  7 -------
 debian/orig-tar.sh      | 21 +++++++++++++++------
 debian/watch            |  3 ++-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10e1547..35f78ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libspring-java (3.0.6.RELEASE-18) UNRELEASED; urgency=medium
 
   * Team upload.
   * Use XZ compression for the upstream tarball
+  * Remove more jar files from the upstream tarball
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 26 Nov 2014 14:06:24 +0100
 
diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
deleted file mode 100644
index 3806567..0000000
--- a/debian/orig-tar.exclude
+++ /dev/null
@@ -1,7 +0,0 @@
-projects/org.springframework.orm/src/test/resources/order-supplemental.jar
-projects/org.springframework.orm/src/test/resources/order.jar
-projects/org.springframework.orm/src/test/java/org/springframework/orm/jpa/jpa-archive.jar
-projects/spring-build/lib/ivy/*
-docs/*
-src/*.jar
-dist/*.jar
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 4a13d69..485fd15 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,11 +1,20 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-DIR=libspring-java-$2
-TAR=libspring-java_$2.orig.tar.xz
+VERSION=$2
+DIR=spring-framework-$VERSION
+TAR=libspring-java_$VERSION.orig.tar.xz
 
-# Repack upstream source to tar.gz
-unzip $3
-mv spring* $DIR
-XZ_OPT=--best tar cJvf $TAR -X debian/orig-tar.exclude $DIR
+echo ""tar -xf $3 --strip-components=1 -C $DIR
+mkdir $DIR
+tar -xf $3 --strip-components=1 -C $DIR
+XZ_OPT=--best tar cJvf $TAR \
+    --exclude '*.jar' \
+    --exclude '*.class' \
+    --exclude '.settings' \
+    --exclude '.project' \
+    --exclude '.classpath' \
+    --exclude 'gradlew*' \
+    --exclude 'gradle/wrapper/*' \
+    $DIR
 rm -rf $DIR
diff --git a/debian/watch b/debian/watch
index 3efab0d..0900aeb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://github.com/spring-projects/spring-framework/releases .*/v([\d\.]+)\.RELEASE\.tar\.gz
+opts=dversionmangle=s/\.RELEASE// \
+https://github.com/spring-projects/spring-framework/tags .*/v([\d\.]+).RELEASE.tar.gz debian debian/orig-tar.sh

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