[freehep-util] 02/04: Remove topgit leftovers.

Giovanni Mascellani gio at moszumanska.debian.org
Mon Jun 6 17:12:17 UTC 2016


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

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

commit 2c9cd5a649be6a7721a1467c0661a0301175a2db
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat Jun 4 18:34:48 2016 +0200

    Remove topgit leftovers.
---
 debian/patches/{patch => }/openide-api.diff | 23 ++++++-----------------
 debian/patches/series                       |  2 +-
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/debian/patches/patch/openide-api.diff b/debian/patches/openide-api.diff
similarity index 51%
rename from debian/patches/patch/openide-api.diff
rename to debian/patches/openide-api.diff
index db3b2d5..853fe2d 100644
--- a/debian/patches/patch/openide-api.diff
+++ b/debian/patches/openide-api.diff
@@ -1,18 +1,9 @@
 From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-Subject: [PATCH] patch/openide-api
-
-Fixes some differences in openide-util API
-
-Signed-off-by: Giovanni Mascellani <mascellani at 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
+Subject: Fix some differences in openide-util API
+Index: freehep-util/src/main/java/org/freehep/util/FreeHEPLookup.java
+===================================================================
+--- freehep-util.orig/src/main/java/org/freehep/util/FreeHEPLookup.java
++++ freehep-util/src/main/java/org/freehep/util/FreeHEPLookup.java
 @@ -1,7 +1,7 @@
  package org.freehep.util;
  
@@ -22,7 +13,7 @@ index d339830..43ddce0 100644
  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
+@@ -86,7 +86,7 @@ public class FreeHEPLookup extends Looku
      */   
     public void setClassLoader(ClassLoader loader)
     {
@@ -31,5 +22,3 @@ index d339830..43ddce0 100644
        proxy.setLookups(contentLookup, serviceLookup);
     }
     public Lookup.Result lookup(Lookup.Template template)
--- 
-tg: (9d16659..) patch/openide-api (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index 4217e8f..a0b5fb0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-patch/openide-api.diff -p1
+openide-api.diff

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



More information about the pkg-java-commits mailing list