[freehep-graphicsio-emf] 07/10: Merge old version from the archive.

[Giovanni Mascellani]

This is an automated email from the git hooks/post-receive script.

gio pushed a commit to branch master
in repository freehep-graphicsio-emf.

commit d4aec812930b70aad28c5b3b73dc31f32ff9b986
Merge: fd268c1 914e665
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Jun 12 18:01:32 2016 +0200

    Merge old version from the archive.
    
    2.1.1-emfplus+dfsg1-2 was never checked in the git repository, I do not
    know why.

 debian/changelog                           | 8 +++++++-
 debian/libfreehep-graphicsio-emf-java.poms | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 6d51798,394ab47..ae63544
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,9 +1,31 @@@
- freehep-graphicsio-emf (2.1.1-emfplus+dfsg1-2) UNRELEASED; urgency=medium
++freehep-graphicsio-emf (2.1.1-emfplus+dfsg1-3) UNRELEASED; urgency=medium
 +
 +  [ Gabriele Giacone ]
 +  * Make VCS-* fields canonical.
 +
 +  [ Giovanni Mascellani ]
 +  * Remove obsolete lines from gbp.conf.
 +  * Move package to priority extra.
 +  * Use secure Vcs-* URLs.
 +  * Bump Standards-Version to 3.9.8 (no changes required).
 +  * Build with debhelper 9 instead of CDBS.
 +  * Remove trivial information in debian/README.source.
 +  * Add classpath to the JAR manifest.
 +
 +  [ Philipp Huebner ]
 +  * Added myself as uploader
 +  * Updated Standards-Version: 3.9.6 (no changes needed)
 +  * Switched to Debhelper 9
 +  * Updated debian/copyright and made it lintian clean
 +
 + -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sat, 19 Jul 2014 02:20:10 +0200
 +
+ freehep-graphicsio-emf (2.1.1-emfplus+dfsg1-2) unstable; urgency=low
+ 
+   * Use option --java-lib to generate JARs in /usr/share/java.
+ 
+  -- Giovanni Mascellani <gio at debian.org>  Thu, 16 Feb 2012 11:13:14 +0100
+ 
  freehep-graphicsio-emf (2.1.1-emfplus+dfsg1-1) unstable; urgency=low
  
    * Merge upstream code from emfplus branch, to support EMF+ format.

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-java/freehep/freehep-graphicsio-emf.git