[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 356c95855b17d6c325a3ee94ed365656502f1f74

Niels Thykier nthykier-guest at alioth.debian.org
Sun Jan 24 17:11:48 UTC 2010 

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 "eclipse - Powerful IDE written in java - Debian package.".

The branch, master has been updated
       via  356c95855b17d6c325a3ee94ed365656502f1f74 (commit)
      from  cef6642a55cbf45a2d4e1174f6bcd6cef297f615 (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 356c95855b17d6c325a3ee94ed365656502f1f74
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Jan 24 18:11:39 2010 +0100

    Add icu4j and lucene2 to system-jars.

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

Summary of changes:
 debian/control                                     |    3 ++-
 debian/patches/lucene.patch                        |   16 ++++++++++++++++
 debian/patches/series                              |    2 ++
 debian/patches/system-jars.patch                   |    8 ++++----
 .../org.eclipse.help.base/META-INF/MANIFEST.MF     |    4 ++--
 system-jars.csv                                    |    8 ++++----
 6 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 52349f1..65fa9ba 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends: ant (>= 1.7.1),
                libhamcrest-java (>= 1.1-4),
                libjetty-java (>= 6.1.22),
                libjsch-java (>= 0.1.37-3),
-               liblucene2-java,
+               liblucene2-java (>= 2.9.1+ds1-5),
                libpango1.0-dev,
                libservlet2.4-java (>= 5.0.30-10),
                libservlet2.5-java (>= 6.0.20-8),
@@ -112,6 +112,7 @@ Depends: default-jre | java1-runtime | java2-runtime | java5-runtime | java6-run
          libcommons-logging-java (>= 1.1.1-6),
          libjetty-java (>= 6.1.22),
          libjsch-java (>= 0.1.37-3),
+         liblucene2-java (>= 2.9.1+ds1-5),
          libservlet2.4-java (>= 5.0.30-10),
          libservlet2.5-java (>= 6.0.20-8),
          libswt-gtk-3.5-java (= ${binary:Version}),
diff --git a/debian/patches/lucene.patch b/debian/patches/lucene.patch
new file mode 100644
index 0000000..ea66358
--- /dev/null
+++ b/debian/patches/lucene.patch
@@ -0,0 +1,16 @@
+Description: Removed expected version for lucene2, since our version is "too new".
+Author: Niels Thykier <niels at thykier.net>
+
+--- a/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
++++ b/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
+@@ -36,8 +36,8 @@ Export-Package: org.apache.lucene.demo.h
+  org.eclipse.help.search,
+  org.eclipse.help.server,
+  org.eclipse.help.standalone
+-Require-Bundle: org.apache.lucene;bundle-version="[1.9.1,2.0.0)";visibility:=reexport,
+- org.apache.lucene.analysis;bundle-version="[1.9.1,2.0.0)";visibility:=reexport,
++Require-Bundle: org.apache.lucene;visibility:=reexport,
++ org.apache.lucene.analysis;visibility:=reexport,
+  org.eclipse.ant.core;bundle-version="3.2.100";resolution:=optional,
+  org.eclipse.core.runtime;bundle-version="3.3.0",
+  org.eclipse.help;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
diff --git a/debian/patches/series b/debian/patches/series
index 9aa47a5..3268b71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ move-config-file-to-etc.patch
 fix-directory-in-eclipse-ini.patch
 system-jars.patch
 codec.patch
+lucene.patch
+debian-changes-3.5.1+repack-1
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index 816eeb2..e439c15 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -193,13 +193,13 @@ Applied-Upstream: no
 +plugins/org.apache.commons.el_*.jar;/usr/share/java/commons-el.jar
 +plugins/org.apache.commons.httpclient_*.jar;/usr/share/java/commons-httpclient.jar
 +plugins/org.apache.commons.logging_*.jar;/usr/share/java/commons-logging.jar
-+#plugins/org.apache.lucene.analysis_*.jar;/usr/share/java/lucene-analyzers.jar
-+#plugins/org.apache.lucene_*.jar;/usr/share/java/lucene-core.jar
++plugins/org.apache.lucene.analysis_*.jar;/usr/share/java/lucene-analyzers.jar
++plugins/org.apache.lucene_*.jar;/usr/share/java/lucene-core.jar
 +plugins/org.hamcrest.core_*.jar;/usr/share/java/hamcrest-core.jar
 +plugins/org.junit4/junit.jar;/usr/share/java/junit4.jar
 +plugins/org.mortbay.jetty.server_*.jar;/usr/share/java/jetty.jar
 +plugins/org.mortbay.jetty.util_*.jar;/usr/share/java/jetty-util.jar
 +plugins/org.sat4j.core_*.jar;/usr/share/sat4j/org.sat4j.core.jar
 +plugins/org.sat4j.pb_*.jar;/usr/share/sat4j/org.sat4j.pb.jar
-+#plugins/com.ibm.icu_*.jar;/usr/share/java/com.ibm.icu.jar
-+#plugins/com.ibm.icu.base_*.jar;/usr/share/java/com.ibm.icu.base.jar
++plugins/com.ibm.icu_*.jar;/usr/share/java/com.ibm.icu.jar
++plugins/com.ibm.icu.base_*.jar;/usr/share/java/com.ibm.icu.base.jar
diff --git a/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
index 5cc8999..2cfc24e 100644
--- a/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
@@ -36,8 +36,8 @@ Export-Package: org.apache.lucene.demo.html;x-internal:=true,
  org.eclipse.help.search,
  org.eclipse.help.server,
  org.eclipse.help.standalone
-Require-Bundle: org.apache.lucene;bundle-version="[1.9.1,2.0.0)";visibility:=reexport,
- org.apache.lucene.analysis;bundle-version="[1.9.1,2.0.0)";visibility:=reexport,
+Require-Bundle: org.apache.lucene;visibility:=reexport,
+ org.apache.lucene.analysis;visibility:=reexport,
  org.eclipse.ant.core;bundle-version="3.2.100";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="3.3.0",
  org.eclipse.help;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
diff --git a/system-jars.csv b/system-jars.csv
index c9cc7f6..27ac2a5 100644
--- a/system-jars.csv
+++ b/system-jars.csv
@@ -36,13 +36,13 @@ plugins/org.apache.commons.codec_*.jar;/usr/share/java/commons-codec.jar
 plugins/org.apache.commons.el_*.jar;/usr/share/java/commons-el.jar
 plugins/org.apache.commons.httpclient_*.jar;/usr/share/java/commons-httpclient.jar
 plugins/org.apache.commons.logging_*.jar;/usr/share/java/commons-logging.jar
-#plugins/org.apache.lucene.analysis_*.jar;/usr/share/java/lucene-analyzers.jar
-#plugins/org.apache.lucene_*.jar;/usr/share/java/lucene-core.jar
+plugins/org.apache.lucene.analysis_*.jar;/usr/share/java/lucene-analyzers.jar
+plugins/org.apache.lucene_*.jar;/usr/share/java/lucene-core.jar
 plugins/org.hamcrest.core_*.jar;/usr/share/java/hamcrest-core.jar
 plugins/org.junit4/junit.jar;/usr/share/java/junit4.jar
 plugins/org.mortbay.jetty.server_*.jar;/usr/share/java/jetty.jar
 plugins/org.mortbay.jetty.util_*.jar;/usr/share/java/jetty-util.jar
 plugins/org.sat4j.core_*.jar;/usr/share/sat4j/org.sat4j.core.jar
 plugins/org.sat4j.pb_*.jar;/usr/share/sat4j/org.sat4j.pb.jar
-#plugins/com.ibm.icu_*.jar;/usr/share/java/com.ibm.icu.jar
-#plugins/com.ibm.icu.base_*.jar;/usr/share/java/com.ibm.icu.base.jar
+plugins/com.ibm.icu_*.jar;/usr/share/java/com.ibm.icu.jar
+plugins/com.ibm.icu.base_*.jar;/usr/share/java/com.ibm.icu.base.jar


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.

More information about the pkg-java-commits mailing list