[gluegen2] 01/05: Prepare import of upstream release 2.3.2

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository gluegen2.

commit 6fb1acfa294f4b903efa94ba9da798cb50d0fc67
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Oct 12 00:03:26 2015 +0200

    Prepare import of upstream release 2.3.2
    
    Upstream switched format of tarball from tar.7z to tar.xz.
    debian/orig-tar.sh updated to handle jcpp embedding automatically.
---
 debian/orig-tar.sh | 11 +++++++----
 debian/watch       |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 3d7ad68..ea0614e 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -5,14 +5,17 @@ DIR=gluegen-v$VERSION
 TAR=gluegen2_$VERSION.orig.tar.xz
 
 # clean up the upstream tarball
-p7zip -d $3
-tar xvf gluegen-v$VERSION.tar
-cd $DIR*
+tar xvf $3
+cd $DIR
 rm -rf .gitignore .htaccess make/lib/
 rm -f $(find . -iname '*.jar')
 cd ..
+# download jcpp
+wget http://jogamp.org/deployment/jogamp-current/archive/Sources/jcpp-v$VERSION.tar.xz
+tar xvf jcpp-v$VERSION.tar.xz -C $DIR/jcpp --strip 1
+
 XZ_OPT=--best tar Jcvf ../$TAR $DIR
-rm -rf $DIR gluegen-v$VERSION.tar
+rm -rf $DIR jcpp-v$VERSION.tar.xz
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
diff --git a/debian/watch b/debian/watch
index 2f51630..807e5d6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-http://jogamp.org/deployment/jogamp-current/archive/Sources/ gluegen-v(.*).tar.7z \
+http://jogamp.org/deployment/jogamp-current/archive/Sources/ gluegen-v(.*).tar.xz \
 debian debian/orig-tar.sh
 

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