[SCM] Java-based codings helper classes for Joni and JRuby branch, master, updated. debian/1.0.4-1-6-gf8b902e

[Hideki Yamane]

The following commit has been merged in the master branch:
commit 0a9689f9fdd6d75e760d1ff6c6641f7951a4a03b
Merge: b5d3ab656680dfdc6f69fbe71f1ca5a9037319e8 c4d2da8eb0939a5421aa2f87d8d88b87dcd993c4
Author: Hideki Yamane <henrich at debian.org>
Date:   Sat Jul 21 09:14:59 2012 +0900

    Imported Debian patch 1.0.4-1.1

diff --combined debian/changelog
index 67989e8,0000000..f948d56
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,0 +1,16 @@@
++jcodings (1.0.4-1.1) UNRELEASED; urgency=low
++
++  * Non-maintainer upload.
++  * debian/watch
++    - fix to watch tags
++  * debian/orig-tar.sh
++    - create tarball in parent directory
++
++ -- Hideki Yamane <henrich at debian.org>  Sat, 21 Jul 2012 09:14:59 +0900
++
 +jcodings (1.0.4-1) unstable; urgency=low
 +
 +  * Initial Release (closes: #590913).
 +    - The package is needed for JRuby.
 +
 + -- Torsten Werner <twerner at debian.org>  Fri, 30 Jul 2010 04:32:11 +0200
diff --combined debian/orig-tar.sh
index 31d53ff,0000000..9fa7791
mode 100755,000000..100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@@ -1,12 -1,0 +1,12 @@@
 +#!/bin/sh -e
 +
 +# called by uscan with '--upstream-version' <version> <file>
 +
 +DIR=jcodings-$2
 +
 +git clone http://github.com/jruby/jcodings.git $DIR
 +(cd $DIR && git checkout $2)
 +
- tar cfz jcodings_$2.orig.tar.gz --exclude .git $DIR
++tar cfz ../jcodings_$2.orig.tar.gz --exclude .git $DIR
 +
 +rm -rf $DIR ../$2
diff --combined debian/watch
index 3f69f13,0000000..367349f
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,3 @@@
 +version=3
- http://github.com/jruby/jcodings/downloads \
++http://github.com/jruby/jcodings/tags \
 +  /jruby/jcodings/tarball/(.*) debian debian/orig-tar.sh

-- 
Java-based codings helper classes for Joni and JRuby