[SCM] json-simple packaging branch, master, updated. upstream/1.1-dfsg1-5-gc960bea

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "json-simple packaging".

The branch, master has been updated
       via  c960bea8cc9547608b05d7d6af359312e5e51e60 (commit)
      from  46ec0ee8f09316f77849463fd9c22e13ac745889 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c960bea8cc9547608b05d7d6af359312e5e51e60
Author: Gilles Filippini <pini at debian.org>
Date:   Wed Mar 2 01:45:23 2011 +0100

    debian/watch + get-orig-source

-----------------------------------------------------------------------

Summary of changes:
 debian/orig-tar.sh |    4 ++--
 debian/rules       |    5 +++++
 debian/watch       |    4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index d7a1284..c107e77 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -6,7 +6,7 @@ VERSION=$2
 DEBIAN_VERSION=$VERSION-dfsg1
 UPSTREAM_SOURCE_DIR=$(echo $SOURCE_NAME | tr '-' '_')-${VERSION}-all
 DEBIAN_SOURCE_DIR=${SOURCE_NAME}-$DEBIAN_VERSION
-TAR=../${SOURCE_NAME}_$DEBIAN_VERSION.orig.tar.bz2
+TAR=${USCAN_DESTDIR:-.}/${SOURCE_NAME}_$DEBIAN_VERSION.orig.tar.bz2
 
 # clean up the upstream tarball
 unzip $3 >/dev/null
@@ -14,5 +14,5 @@ unzip $3 >/dev/null
 mv ${UPSTREAM_SOURCE_DIR} ${DEBIAN_SOURCE_DIR}
 # Remove excluded files
 tar -c -j -X debian/orig-tar.exclude -f $TAR ${DEBIAN_SOURCE_DIR}/
-rm -rf ${DEBIAN_SOURCE_DIR}
+rm -rf ${DEBIAN_SOURCE_DIR} $3
 echo "${SOURCE_NAME}: Applied DFSG removals and set up tarball to `basename ${TAR}`"
diff --git a/debian/rules b/debian/rules
index b7f3422..ca37df5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,3 +14,8 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 
 override_dh_auto_clean:
 	[ ! -d build/main ] || dh_auto_clean
+
+get-orig-source:
+	destdir=$(PWD) && \
+	cd $(shell dirname $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))/.. && \
+	USCAN_DESTDIR=$$destdir uscan --noconf --force-download --rename
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..9249bb7
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+opts="dversionmangle=s/-dfsg\d+$//" \
+http://code.google.com/p/json-simple/downloads/list .*/json_simple-(.*)-all\.zip \
+debian debian/orig-tar.sh


hooks/post-receive
-- 
json-simple packaging