[SCM] FreeHEP Portable Document Format Driver branch, master, updated. upstream/2.1.1-6-ge19a0ed

[Giovanni Mascellani]

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 "FreeHEP Portable Document Format Driver".

The branch, master has been updated
       via  e19a0edf31284610576528ab89863a62f7ea2d7a (commit)
       via  0e63eae8d562d4001d46e14c2a29e0dc4f16377f (commit)
       via  59a7eec2741fbc86f4eee5af4672430f5dff0a89 (commit)
      from  6f91625e9724c68e5d938fdbaf27c59f871238ff (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 e19a0edf31284610576528ab89863a62f7ea2d7a
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Apr 6 10:25:08 2010 +0200

    orig-tar.sh further fixed

commit 0e63eae8d562d4001d46e14c2a29e0dc4f16377f
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Apr 6 10:15:21 2010 +0200

    orig-tar.sh fixed

commit 59a7eec2741fbc86f4eee5af4672430f5dff0a89
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Apr 6 09:47:27 2010 +0200

    Watch file fixed

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

Summary of changes:
 debian/changelog   |    6 ++++++
 debian/orig-tar.sh |   10 ++++------
 debian/watch       |    2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b242edf..c30ff96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freehep-graphicsio-pdf (2.1.1+dfsg-2) unstable; urgency=low
+
+  * Tarball generation script fixed
+
+ -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it>  Tue, 06 Apr 2010 10:14:41 +0200
+
 freehep-graphicsio-pdf (2.1.1+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #572573)
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 115ebef..3a36d80 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -2,15 +2,13 @@
 
 VERSION=$2
 PACKAGE=$(dpkg-parsechangelog | sed -n 's/^Source: //p')
-TAR=../${PACKAGE}_${VERSION}.orig.tar.gz
+TAR=../${PACKAGE}_${VERSION}+dfsg1.orig.tar.gz
 DIR=${PACKAGE}-${VERSION}
 
 svn export svn://svn.freehep.org/svn/freehep/tags/vectorgraphics-${VERSION}/$PACKAGE $DIR
+rm -f $DIR/src/test/resources/pdf/*.pdf
 GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
 rm -rf $DIR
 
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi
+rm -f $DOWNLOADED_FILE
+
diff --git a/debian/watch b/debian/watch
index cc7fb8e..6e714d7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts="uversionmangle=s/^.*-SNAPSHOT/~$1/,dversionmangle=s/\+dfsg//" \
+opts="uversionmangle=s/^.*-SNAPSHOT/~$1/,dversionmangle=s/\+dfsg[0-9]*//" \
   http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-pdf/ \
   (\d.*)/ debian debian/orig-tar.sh


hooks/post-receive
-- 
FreeHEP Portable Document Format Driver