[SCM] FreeHEP Enhanced Metafile Format Driver branch, master, updated. upstream/2.1.1-7-g2c5a43e

[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 Enhanced Metafile Format Driver".

The branch, master has been updated
       via  2c5a43e26055b0bbf117c921b1c4de3b22f79b51 (commit)
       via  539573681566133a07a8e54f5e1bcc4654b36a83 (commit)
       via  131aefd3ae219bc3384c56e1b0197d1346e5e173 (commit)
      from  71c9d3992cf900d06365a964d92d41c8db0445e8 (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 2c5a43e26055b0bbf117c921b1c4de3b22f79b51
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Apr 6 10:26:45 2010 +0200

    orig-tar.sh further fixed

commit 539573681566133a07a8e54f5e1bcc4654b36a83
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Apr 6 10:15:20 2010 +0200

    orig-tar.sh fixed

commit 131aefd3ae219bc3384c56e1b0197d1346e5e173
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Apr 6 09:47:25 2010 +0200

    Watch file fixed

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

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

diff --git a/debian/changelog b/debian/changelog
index 271e8e2..8578042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freehep-graphicsio-emf (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:30 +0200
+
 freehep-graphicsio-emf (2.1.1+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #572572)
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 115ebef..7e3952c 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -2,15 +2,14 @@
 
 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/emf/*.emf
+rm -f $DIR/src/test/resources/emf/*.emf.gz
 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 d97f79c..48ef3cf 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-emf/ \
   (\d.*)/ debian debian/orig-tar.sh


hooks/post-receive
-- 
FreeHEP Enhanced Metafile Format Driver