[SCM] FreeHEP Utility Library branch, master, updated. upstream/2.0.2-7-gc07eccc
Giovanni Mascellani
gmascellani-guest at alioth.debian.org
Wed Nov 4 13:53:52 UTC 2009
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 c07eccc4f3be6b30eb8d5805f5eff8ab7f23fe72 (commit)
via d89cc13c99379a79375642f07e4399a6faa1d394 (commit)
via 029961f9976066b7d489e65954fb8bab91d264a7 (commit)
via d51f066db4fed0aa75bd7a1d0c12aaaeb32fc08a (commit)
from ebdfae732d538e824bb1ff80ba84a477f5e45b43 (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 c07eccc4f3be6b30eb8d5805f5eff8ab7f23fe72
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Wed Nov 4 14:46:47 2009 +0100
Fixed binary dependencies
commit d89cc13c99379a79375642f07e4399a6faa1d394
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Wed Nov 4 14:31:32 2009 +0100
Debian packaging nearly ready
commit 029961f9976066b7d489e65954fb8bab91d264a7
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Wed Nov 4 14:00:41 2009 +0100
Different packages in openide
commit d51f066db4fed0aa75bd7a1d0c12aaaeb32fc08a
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Wed Nov 4 13:52:09 2009 +0100
Fixing build with non maven dependency agains openide-lookup
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 3 +-
debian/control | 18 ++++++------
debian/copyright | 33 +++++++++++++-------
debian/fake-poms.conf | 1 +
pom.xml | 5 +++
src/main/java/org/freehep/util/FreeHEPLookup.java | 4 +-
6 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d91c1c2..d538871 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
freehep-util (2.0.2-1) UNRELEASED; urgency=low
- * Initial release (Closes: #nnnn) <nnnn is the bug number of your
- ITP>
+ * Initial release (Closes: #554141)
-- Giovanni Mascellani <mascellani at poisson.phc.unipi.it> Sat, 31 Oct 2009 16:59:30 +0100
diff --git a/debian/control b/debian/control
index c079c12..8a51e6e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,18 @@ 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, default-jdk, maven-debian-helper
-Build-Depends-Indep:
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 7), cdbs, maven-debian-helper
+Build-Depends-Indep: default-jdk, netbeans-platform
+Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/freehep-util
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/freehep-util/
-Homepage: TODO
+Homepage: http://java.freehep.org/
Package: libfreehep-util-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${misc:Depends}, ${maven:Depends}, netbeans-platform, java2-runtime
Recommends: ${maven:OptionalDepends}
-Description: FreeHEP Util
- FreeHEP Utility Library
-
-
+Description: FreeHEP utility library
+ Miscellaneous utility library used by other components of FreeHEP.
+ .
+ FreeHEP is a collection of Java libraries used in High Energy Phisics.
diff --git a/debian/copyright b/debian/copyright
index 9c66bf7..7ebf4fd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,29 @@
Format-Specification: http://dep.debian.net/deps/dep5/
-Name: FreeHEP Util
-Maintainer: ${project.Organization.Name}
-Source: ${project.Url}
+Name: FreeHEP utility library
+Maintainer: The FreeHEP team
+Source: http://java.freehep.org/
Files: *
-License: NOT-FOUND
+Copyright: © Mark Donszelmann <Mark.Donszelmann at slac.stanford.edu>
+ © Tony Johnson <tonyj at slac.stanford.edu>
+ © Max Turri <turri at slac.stanford.edu>
+ © Victor Serbo <Victor.Serbo at slac.stanford.edu>
+ © Gary Bower <Gary.Bower at slac.stanford.edu>
+ © Julius Hrivnac <hrivnac at lal.in2p3.fr>
+ © Cal Loomis <loomis at lal.in2p3.fr>
+ © Joseph Perl <Joseph.Perl at slac.stanford.edu>
+ © Peter Armstrong
+ © Simon Fischer
+ © Andre Bach
+ © Partick Hellwig
+ © Sami Kama
+ © Paul Spence
+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'
Files: debian/*
-Copyright: Copyright 2009, Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+Copyright: © 2009 Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
License: GPL-3+
-
-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'
-
-License: NOT-FOUND
- TODO: include the full license text here
-
-
diff --git a/debian/fake-poms.conf b/debian/fake-poms.conf
new file mode 100644
index 0000000..f1ca39a
--- /dev/null
+++ b/debian/fake-poms.conf
@@ -0,0 +1 @@
+org.netbeans openide-lookup /usr/lib/netbeans/platform7/lib/org-openide-util.jar debian
diff --git a/pom.xml b/pom.xml
index abbf4a8..0ee762b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,11 @@
</repositories>
<dependencies>
<dependency>
+ <groupId>org.netbeans</groupId>
+ <artifactId>openide-lookup</artifactId>
+ <version>1.9-patched-1.0</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
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)
hooks/post-receive
--
FreeHEP Utility Library
More information about the pkg-java-commits
mailing list