[SCM] FreeHEP Utility Library branch, master, updated. debian/2.0.2-1-10-gfffad0c

[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, master has been updated
       via  fffad0c9ddb2d026e0f882b14324234a019d707e (commit)
       via  7c4bf302df634e2659a18043adb6c49e33700e07 (commit)
       via  23938a6d5923bee96291c5581738d21a1035eced (commit)
       via  6c14c88fe2d343093e77842ebcddad8f2e3d0e33 (commit)
      from  c1c80c988275340f90cfc22d8b1ac35cd3f0fb72 (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 fffad0c9ddb2d026e0f882b14324234a019d707e
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat Nov 28 19:23:25 2009 +0100

    src/main/java/org/freehep/util/FreeHEPLookup.java reset to upstream in master

commit 7c4bf302df634e2659a18043adb6c49e33700e07
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat Nov 28 19:20:13 2009 +0100

    build.xml reset to upstream in master

commit 23938a6d5923bee96291c5581738d21a1035eced
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat Nov 28 19:15:42 2009 +0100

    Build branch is now "build"

commit 6c14c88fe2d343093e77842ebcddad8f2e3d0e33
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat Nov 28 19:15:20 2009 +0100

    Switched to quilt and topgit patches over upstream code

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

Summary of changes:
 debian/changelog                                  |    3 ++-
 debian/control                                    |    2 +-
 debian/gbp.conf                                   |    2 +-
 debian/rules                                      |    2 ++
 pom.xml                                           |    4 ++--
 src/main/java/org/freehep/util/FreeHEPLookup.java |    4 ++--
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7eaf4f3..3c93e25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ 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
 
- -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it>  Sun, 22 Nov 2009 11:43:51 +0100
+ -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it>  Sat, 28 Nov 2009 19:15:08 +0100
 
 freehep-util (2.0.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 399ba93..7e79d4a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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>
-Build-Depends: debhelper (>= 7), cdbs, maven-debian-helper
+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
 Vcs-Git: git://git.debian.org/git/pkg-java/freehep/freehep-util.git
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 7c036eb..d730773 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,6 +2,6 @@
 [DEFAULT]
 cleaner = fakeroot debian/rules clean
 upstream-branch = upstream
-debian-branch = master
+debian-branch = build
 pristine-tar = True
 
diff --git a/debian/rules b/debian/rules
index c9523a8..90ab7ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 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
 
diff --git a/pom.xml b/pom.xml
index 33d41f6..0ee762b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
   <dependencies>
     <dependency>
       <groupId>org.netbeans</groupId>
-      <artifactId>openide-util</artifactId>
-      <version>6.7.1</version>
+      <artifactId>openide-lookup</artifactId>
+      <version>1.9-patched-1.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
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