The following commit has been merged in the build branch:
commit 4c24a22c89d3cef97f6ef27450891594d43ba03c
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date: Sun Oct 9 10:43:53 2011 +0200
Patches updated.
diff --git a/debian/patches/patch/openide-api.diff
b/debian/patches/patch/openide-api.diff
index f5db29a..db3b2d5 100644
--- a/debian/patches/patch/openide-api.diff
+++ b/debian/patches/patch/openide-api.diff
@@ -32,4 +32,4 @@ index d339830..43ddce0 100644
}
public Lookup.Result lookup(Lookup.Template template)
--
-tg: (3a6bbbc..) patch/openide-api (depends on: master)
+tg: (9d16659..) patch/openide-api (depends on: master)
diff --git a/debian/patches/patch/pom.xml.diff
b/debian/patches/patch/pom.xml.diff
deleted file mode 100644
index b2f5365..0000000
--- a/debian/patches/patch/pom.xml.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Giovanni Mascellani <mascell...@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 <mascell...@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)
diff --git a/debian/patches/series b/debian/patches/series
index 61edabf..4217e8f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
patch/openide-api.diff -p1
-patch/pom.xml.diff -p1
--
FreeHEP Utility Library
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
