--- freehep-util-2.0.2.orig/debian/control
+++ freehep-util-2.0.2/debian/control
@@ -0,0 +1,24 @@
+Source: freehep-util
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Giovanni Mascellani <mascellani@poisson.phc.unipi.it>,
+ Gabriele Giacone <1o5g4r8o@gmail.com>
+Build-Depends: debhelper (>= 7), cdbs, maven-debian-helper, quilt, default-jdk
+Build-Depends-Indep: libopenide-util-java (>= 6.7.1-2), junit
+Standards-Version: 3.8.4
+Vcs-Git: git://git.debian.org/git/pkg-java/freehep/freehep-util.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/freehep/freehep-util.git
+Homepage: http://java.freehep.org/
+
+Package: libfreehep-util-java
+Architecture: all
+Depends: ${misc:Depends}, ${maven:Depends}, openjdk-6-jre | java2-runtime
+Recommends: ${maven:OptionalDepends}
+Description: FreeHEP utility library
+ This library contains miscellaneous utility classes used in other
+ FreeHEP components, such as classes dealing with physical errors and
+ scientific notation, assertions, hash tables, option parsers and
+ others.
+ .
+ FreeHEP is a collection of Java libraries used in High Energy Physics.
--- freehep-util-2.0.2.orig/debian/compat
+++ freehep-util-2.0.2/debian/compat
@@ -0,0 +1 @@
+7
--- freehep-util-2.0.2.orig/debian/maven.rules
+++ freehep-util-2.0.2/debian/maven.rules
@@ -0,0 +1 @@
+junit junit jar s/.*/3.x/ *
--- freehep-util-2.0.2.orig/debian/gbp.conf
+++ freehep-util-2.0.2/debian/gbp.conf
@@ -0,0 +1,7 @@
+
+[DEFAULT]
+cleaner = fakeroot debian/rules clean
+upstream-branch = upstream
+debian-branch = build
+pristine-tar = True
+
--- freehep-util-2.0.2.orig/debian/copyright
+++ freehep-util-2.0.2/debian/copyright
@@ -0,0 +1,23 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: FreeHEP utility library
+Maintainer: The FreeHEP team
+Source: http://java.freehep.org/
+
+Files: *
+Copyright: 2000-2007, CERN, Geneva, Switzerland
+           2000-2007, SLAC, Stanford, California, U.S.A.
+           2000-2007, University of California Santa Cruz, U.S.A.
+License: LGPL-2.1+
+  On Debian GNU/Linux system you can find the complete text of the
+  LGPL-2.1 license in '/usr/share/common-licenses/LGPL-2.1'
+  No license files are included in upstream tarball but copyright holders
+  list is available at
+  <http://java.freehep.org/svn/repos/freehep/show/freehep/trunk/vectorgraphics/LICENSE.txt>
+  and adopted license at <http://java.freehep.org/license.html>
+
+Files: debian/*
+Copyright: 2009-2010 Giovanni Mascellani <mascellani@poisson.phc.unipi.it>
+Copyright: 2009-2010 Gabriele Giacone <1o5g4r8o@gmail.com>
+License: GPL-3+
+  On Debian GNU/Linux system you can find the complete text of the
+  GPL-3 license in '/usr/share/common-licenses/GPL-3'
--- freehep-util-2.0.2.orig/debian/libfreehep-util-java.poms
+++ freehep-util-2.0.2/debian/libfreehep-util-java.poms
@@ -0,0 +1 @@
+pom.xml --no-parent
--- freehep-util-2.0.2.orig/debian/rules
+++ freehep-util-2.0.2/debian/rules
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+-include /usr/share/topgit/tg2quilt.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
--- freehep-util-2.0.2.orig/debian/maven.properties
+++ freehep-util-2.0.2/debian/maven.properties
@@ -0,0 +1 @@
+maven.test.skip=false
--- freehep-util-2.0.2.orig/debian/README.source
+++ freehep-util-2.0.2/debian/README.source
@@ -0,0 +1,21 @@
+Information about freehep-util
+------------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
+
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.  Please see:
+
+    /usr/share/doc/quilt/README.source
+
+for more information on how to apply the patches, modify patches, or
+remove a patch.
+
+
+
--- freehep-util-2.0.2.orig/debian/watch
+++ freehep-util-2.0.2/debian/watch
@@ -0,0 +1,2 @@
+# Watch file missing, because upstream releases are available only via
+# SVN, but uscan is unable to read in a SVN repository.
--- freehep-util-2.0.2.orig/debian/changelog
+++ freehep-util-2.0.2/debian/changelog
@@ -0,0 +1,29 @@
+freehep-util (2.0.2-4) unstable; urgency=low
+
+  * Moved default-jdk from Build-Depends-Indep to Build-Depends
+
+ -- Gabriele Giacone <1o5g4r8o@gmail.com>  Thu, 04 Mar 2010 00:50:59 +0100
+
+freehep-util (2.0.2-3) unstable; urgency=low
+
+  * Description improved.
+  * debian/copyright: fixed
+  * Standards version bumped to 3.8.4.
+
+ -- Giovanni Mascellani <mascellani@poisson.phc.unipi.it>  Wed, 03 Feb 2010 11:28:12 +0100
+
+freehep-util (2.0.2-2) unstable; urgency=low
+
+  * debian/fake-poms.conf: deleted, now openide-util provides a POM
+  * Enabling compile time tests
+  * debian/control: typo in long description
+  * Switched to quilt and topgit patches over upstream code
+  * Adding Gabriele Giacone as comaintainer 
+
+ -- Giovanni Mascellani <mascellani@poisson.phc.unipi.it>  Fri, 04 Dec 2009 01:06:35 +0100
+
+freehep-util (2.0.2-1) unstable; urgency=low
+
+  * Initial release (Closes: #554141)
+
+ -- Giovanni Mascellani <mascellani@poisson.phc.unipi.it>  Sun, 08 Nov 2009 22:18:30 +0100
--- freehep-util-2.0.2.orig/debian/patches/series
+++ freehep-util-2.0.2/debian/patches/series
@@ -0,0 +1,2 @@
+patch/openide-api.diff -p1
+patch/pom.xml.diff -p1
--- freehep-util-2.0.2.orig/debian/patches/patch/pom.xml.diff
+++ freehep-util-2.0.2/debian/patches/patch/pom.xml.diff
@@ -0,0 +1,29 @@
+From: Giovanni Mascellani <mascellani@poisson.phc.unipi.it>
+Subject: [PATCH] patch/pom.xml
+
+Patch to pom.xml, in order to depend on openide-util instead of
+openide-lookup
+
+Signed-off-by: Giovanni Mascellani <mascellani@poisson.phc.unipi.it>
+
+---
+ pom.xml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 0ee762b..33d41f6 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -20,8 +20,8 @@
+   <dependencies>
+     <dependency>
+       <groupId>org.netbeans</groupId>
+-      <artifactId>openide-lookup</artifactId>
+-      <version>1.9-patched-1.0</version>
++      <artifactId>openide-util</artifactId>
++      <version>6.7.1</version>
+     </dependency>
+     <dependency>
+       <groupId>junit</groupId>
+-- 
+tg: (3a6bbbc..) patch/pom.xml (depends on: master)
--- freehep-util-2.0.2.orig/debian/patches/patch/openide-api.diff
+++ freehep-util-2.0.2/debian/patches/patch/openide-api.diff
@@ -0,0 +1,35 @@
+From: Giovanni Mascellani <mascellani@poisson.phc.unipi.it>
+Subject: [PATCH] patch/openide-api
+
+Fixes some differences in openide-util API
+
+Signed-off-by: Giovanni Mascellani <mascellani@poisson.phc.unipi.it>
+
+---
+ src/main/java/org/freehep/util/FreeHEPLookup.java |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/main/java/org/freehep/util/FreeHEPLookup.java b/src/main/java/org/freehep/util/FreeHEPLookup.java
+index d339830..43ddce0 100644
+--- a/src/main/java/org/freehep/util/FreeHEPLookup.java
++++ b/src/main/java/org/freehep/util/FreeHEPLookup.java
+@@ -1,7 +1,7 @@
+ package org.freehep.util;
+ 
+ import org.openide.util.Lookup;
+-import org.openide.util.MetaInfServicesLookup;
++import org.openide.util.lookup.Lookups;
+ import org.openide.util.lookup.AbstractLookup;
+ import org.openide.util.lookup.InstanceContent;
+ import org.openide.util.lookup.ProxyLookup;
+@@ -86,7 +86,7 @@ public class FreeHEPLookup extends Lookup
+     */   
+    public void setClassLoader(ClassLoader loader)
+    {
+-      Lookup serviceLookup = new MetaInfServicesLookup(loader);
++      Lookup serviceLookup = Lookups.metaInfServices(loader);
+       proxy.setLookups(contentLookup, serviceLookup);
+    }
+    public Lookup.Result lookup(Lookup.Template template)
+-- 
+tg: (3a6bbbc..) patch/openide-api (depends on: master)
