[SCM] FreeHEP Utility Library branch, patch/pom.xml, updated. debian/2.0.2-1-18-g4576a6a

[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 Utility Library".

The branch, patch/pom.xml has been updated
       via  4576a6ab20699e5f738e23bed897ae17de4faea1 (commit)
       via  3a6bbbc27be0f2939e72e0ef79c9c26c138d60e5 (commit)
       via  de6f3d11b1a0857093683a79a8e3138055dcd60d (commit)
       via  fffad0c9ddb2d026e0f882b14324234a019d707e (commit)
      from  4596815b830ca372d723af63b536668e3028c860 (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 4576a6ab20699e5f738e23bed897ae17de4faea1
Merge: 4596815b830ca372d723af63b536668e3028c860 3a6bbbc27be0f2939e72e0ef79c9c26c138d60e5
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Dec 4 23:53:31 2009 +0100

    Merge commit 'refs/top-bases/patch/pom.xml' into patch/pom.xml

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

Summary of changes:
 debian/changelog                                  |    3 ++-
 debian/control                                    |    3 ++-
 debian/maven.rules                                |    1 +
 src/main/java/org/freehep/util/FreeHEPLookup.java |    4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3c93e25..0d953c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ freehep-util (2.0.2-2) unstable; urgency=low
   * 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 at poisson.phc.unipi.it>  Sat, 28 Nov 2009 19:15:08 +0100
+ -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it>  Fri, 04 Dec 2009 01:06:35 +0100
 
 freehep-util (2.0.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7e79d4a..08b670c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: freehep-util
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+Uploaders: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>,
+ Gabriele Giacone <losgarbo at libero.it>
 Build-Depends: debhelper (>= 7), cdbs, maven-debian-helper, quilt
 Build-Depends-Indep: default-jdk, libopenide-util-java (>= 6.7.1-2), junit
 Standards-Version: 3.8.3
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..b972e20
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+junit junit jar s/3\..*/3.x/ *
diff --git a/src/main/java/org/freehep/util/FreeHEPLookup.java b/src/main/java/org/freehep/util/FreeHEPLookup.java
index 43ddce0..d339830 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.lookup.Lookups;
+import org.openide.util.MetaInfServicesLookup;
 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 = Lookups.metaInfServices(loader);
+      Lookup serviceLookup = new MetaInfServicesLookup(loader);
       proxy.setLookups(contentLookup, serviceLookup);
    }
    public Lookup.Result lookup(Lookup.Template template)


hooks/post-receive
-- 
FreeHEP Utility Library