[SCM] FreeHEP Enhanced Metafile Format Driver branch, master, updated. upstream/2.1.1+dfsg-18-g870dfdc

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit b89acffb900abb02d6508dd71fa7b78867050f28
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Jan 10 12:14:46 2012 +0100

    Some documentation about the merge with the emfplus branch.

diff --git a/debian/README.source b/debian/README.source
index 26855af..95bc2dc 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -12,9 +12,13 @@ the Debian policy.
 
 REPACKAGING
 
- To comply with DFSG, the following binary files have been removed from
- upstream tarball:
+To comply with DFSG, the following binary files have been removed from
+upstream tarball:
 
  - src/test/resources/emf/*.emf
  - src/test/resources/emf/*.emf.gz
 
+Moreover, the upstream codebase was manually merged with the emfplus
+branch available here:
+
+http://java.freehep.org/svn/repos/freehep/list/freehep/branches/vectorgraphics-emfplus/freehep-graphicsio-emf/?revision=HEAD&bypassEmpty=true
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 957aaa5..1844f4b 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,5 +1,11 @@
 #!/bin/sh -e
 
+# At the moment this script doesn't work correctly, because the
+# upstream codebase must be manually merged with the emfplus branch
+# available here:
+#
+# http://java.freehep.org/svn/repos/freehep/list/freehep/branches/vectorgraphics-emfplus/freehep-graphicsio-emf/?revision=HEAD&bypassEmpty=true
+
 VERSION=$2
 DOWNLOADED_FILE=$3
 PACKAGE=$(dpkg-parsechangelog | sed -n 's/^Source: //p')

-- 
FreeHEP Enhanced Metafile Format Driver