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  f0106c8aa36c11e8857d70992a1ce8e13628f6b0 (commit)
       via  95e7a78ef56765d7c4f736437632d77a7615b88e (commit)
       via  a15b213fd16aa92e07059ab66af4b86bec85f88e (commit)
       via  9cd5c63d4c364f7e10cb723255e49ef9e9994f9f (commit)
      from  6d23ade1e29ecd137dea760188f7c713790aae32 (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 f0106c8aa36c11e8857d70992a1ce8e13628f6b0
Author: Benjamin Drung <[email protected]>
Date:   Fri Feb 26 15:17:22 2010 +0100

    Refresh patches.

commit 95e7a78ef56765d7c4f736437632d77a7615b88e
Merge: a15b213fd16aa92e07059ab66af4b86bec85f88e 
9cd5c63d4c364f7e10cb723255e49ef9e9994f9f
Author: Benjamin Drung <[email protected]>
Date:   Fri Feb 26 15:15:16 2010 +0100

    Merge branch 'upstream'

commit a15b213fd16aa92e07059ab66af4b86bec85f88e
Author: Benjamin Drung <[email protected]>
Date:   Fri Feb 26 15:14:48 2010 +0100

    Remove unneeded patches codec.patch and system-jars.patch.

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

Summary of changes:
 ChangeLog                                          |   17 ++++
 build.xml                                          |    9 ++-
 debian/patches/codec.patch                         |   18 ----
 debian/patches/eclipse-manpage.patch               |    8 +-
 debian/patches/fix-shell-script-perm.patch         |    6 +-
 debian/patches/series                              |    2 -
 debian/patches/system-jars.patch                   |   85 --------------------
 dependencies.properties                            |    8 +-
 .../org.eclipse.equinox.p2.user.ui/feature.xml     |    2 +-
 patches/eclipse-use-newer-commons-codec.patch      |   11 +++
 10 files changed, 48 insertions(+), 118 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3628556..2a7809f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-02-26  Andrew Overholt  <[email protected]>
+
+       Bug #280688
+
+       * dependencies.properties: Add Debian/Ubuntu locations (Benjamin 
Drung). 
+       * nonosgidependencies.properties: Likewise.
+
+2010-02-26  Alexander Kurtakov  <[email protected]>
+
+       * patches/eclipse-use-newer-commons-codec.patch: New file.
+       * build.xml: Apply patch to use whatever commons-codec version is 
available.
+       * dependencies.properties: Add unversioned jetty jars (needed for 
Fedora 13).
+
+2010-02-25  Andrew Overholt  <[email protected]>
+
+       * build.xml: Re-symlink in installation directory.
+
 2010-02-25  Andrew Overholt  <[email protected]>
 
        * task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
diff --git a/build.xml b/build.xml
index 738bf34..ad1918c 100644
--- a/build.xml
+++ b/build.xml
@@ -254,6 +254,7 @@
                <chmod 
dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" 
includes="*.sh" perm="a+x" />
                <patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" 
dir="${buildDirectory}" strip="1" />
                <patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" 
dir="${buildDirectory}" strip="1" />
+               <patch 
patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" 
dir="${buildDirectory}"  strip="0" />
                <replace 
file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties"
 token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
                <chmod 
dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" 
includes="*.sh" perm="a+x" />
                <!-- end eclipse-build-only patches -->
@@ -605,6 +606,12 @@
                                <include 
name="org.eclipse.equinox.initializer*.jar" />
                        </fileset>
                </copy>
+               
+               <symlinkOSGiJars 
dependencies="${basedir}/dependencies.properties" 
+                       topLevelDir="${buildDirectory}/installation/plugins"/>
+               <symlinkNonOSGiJars 
dependencies="${basedir}/nonosgidependencies.properties"
+                       topLevelDir="${buildDirectory}/installation/plugins"/>
+               
                <echo file="provision.sdk-stamp" />
        </target>
 
@@ -806,7 +813,7 @@
                <mkdir dir="${destDir}/etc" />
                <move file="${destDir}${prefix}/lib/eclipse/eclipse.ini" 
tofile="${destDir}/etc/eclipse.ini" />
                <symlink link="${destDir}${prefix}/lib/eclipse/eclipse.ini" 
resource="/etc/eclipse.ini" />
-
+               
        </target>
 
        <target name="package.extract.swt">
diff --git a/debian/patches/codec.patch b/debian/patches/codec.patch
deleted file mode 100644
index 7e7d4a6..0000000
--- a/debian/patches/codec.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Tell eclipse that any version of commons-codec can be used.
-Author: Niels Thykier <[email protected]>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=294748
-Applied-Upstream: no
-
-Index: debian.git/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
-===================================================================
---- 
debian.git.orig/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml     
   2010-02-24 16:33:29.035338554 +0100
-+++ debian.git/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml     
2010-02-24 16:33:45.885338990 +0100
-@@ -305,7 +305,7 @@
-          id="org.apache.commons.codec"
-          download-size="0"
-          install-size="0"
--         version="1.3.0.qualifier"
-+         version="0.0.0"
-          unpack="false"/>
- 
-    <plugin
diff --git a/debian/patches/eclipse-manpage.patch 
b/debian/patches/eclipse-manpage.patch
index 7d55ef9..47331c6 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -6,7 +6,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
 Index: debian.git/eclipse.1.xml
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ debian.git/eclipse.1.xml   2010-02-25 23:53:35.404482161 +0100
++++ debian.git/eclipse.1.xml   2010-02-26 15:15:45.845671484 +0100
 @@ -0,0 +1,616 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 + <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -626,9 +626,9 @@ Index: debian.git/eclipse.1.xml
 +</refentry>
 Index: debian.git/build.xml
 ===================================================================
---- debian.git.orig/build.xml  2010-02-25 23:53:27.164482657 +0100
-+++ debian.git/build.xml       2010-02-25 23:53:35.404482161 +0100
-@@ -789,6 +789,12 @@
+--- debian.git.orig/build.xml  2010-02-26 15:15:37.195671648 +0100
++++ debian.git/build.xml       2010-02-26 15:15:45.845671484 +0100
+@@ -796,6 +796,12 @@
                <!-- eclipse binary -->
                <mkdir dir="${destDir}${prefix}/bin" />
                <symlink link="${destDir}${prefix}/bin/eclipse" 
resource="../${libDir}/eclipse/eclipse" />
diff --git a/debian/patches/fix-shell-script-perm.patch 
b/debian/patches/fix-shell-script-perm.patch
index fbb465b..10dba9e 100644
--- a/debian/patches/fix-shell-script-perm.patch
+++ b/debian/patches/fix-shell-script-perm.patch
@@ -5,8 +5,8 @@ Applied-Upstream: no
 
 Index: debian.git/build.xml
 ===================================================================
---- debian.git.orig/build.xml  2010-02-25 23:53:22.473233238 +0100
-+++ debian.git/build.xml       2010-02-25 23:53:27.164482657 +0100
+--- debian.git.orig/build.xml  2010-02-26 15:15:25.655671490 +0100
++++ debian.git/build.xml       2010-02-26 15:15:37.195671648 +0100
 @@ -251,6 +251,7 @@
                <patch 
patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" 
dir="${buildDirectory}" strip="3" />
                <patch 
patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" 
dir="${buildDirectory}" strip="3" />
@@ -14,4 +14,4 @@ Index: debian.git/build.xml
 +              <chmod 
dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" 
includes="*.sh" perm="a+x" />
                <patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" 
dir="${buildDirectory}" strip="1" />
                <patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" 
dir="${buildDirectory}" strip="1" />
-               <replace 
file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties"
 token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
+               <patch 
patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" 
dir="${buildDirectory}"  strip="0" />
diff --git a/debian/patches/series b/debian/patches/series
index a614dda..9c7202a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 fix-shell-script-perm.patch
-codec.patch
 lucene.patch
 eclipse-manpage.patch
 pdebuild-script.patch
 pdebuild-path-copy-platform.patch
-system-jars.patch
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
deleted file mode 100644
index 03a7c94..0000000
--- a/debian/patches/system-jars.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Description: Add Debians search location
-Author: Benjamin Drung <[email protected]>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=280688
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/453036
-Applied-Upstream: no
-
-Index: eclipse-build/dependencies.properties
-===================================================================
---- eclipse-build/dependencies.properties      (Revision 24279)
-+++ eclipse-build/dependencies.properties      (Arbeitskopie)
-@@ -1,17 +1,17 @@
--com.ibm.icu_4.0.1.v20090822.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar
-+com.ibm.icu_4.0.1.v20090822.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/share/java/com.ibm.icu.jar
- com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
--javax.servlet_2.5.0.v200806031605.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar
--javax.servlet.jsp_2.0.0.v200806031607.jar=/usr/share/java/tomcat5-jsp-2.0-api.jar
-+javax.servlet_2.5.0.v200806031605.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar
-+javax.servlet.jsp_2.0.0.v200806031607.jar=/usr/share/java/tomcat5-jsp-2.0-api.jar:/usr/share/java/jsp-api-2.0.jar
- 
org.apache.commons.codec_1.3.0.v20080530-1600.jar=/usr/share/java/commons-codec.jar
- org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
- 
org.apache.commons.httpclient_3.1.0.v20080605-1935.jar=/usr/share/java/commons-httpclient.jar
- 
org.apache.commons.logging_1.0.4.v200904062259.jar=/usr/share/java/commons-logging.jar
--org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar
--org.apache.lucene_1.9.1.v20080530-1600.jar=/usr/share/java/lucene.jar
--org.apache.lucene.analysis_1.9.1.v20080530-1600.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar
--org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar
--org.mortbay.jetty.server_6.1.15.v200905151201.jar=/usr/share/java/jetty/jetty-6.1.20.jar
--org.mortbay.jetty.util_6.1.15.v200905182336.jar=/usr/share/java/jetty/jetty-util-6.1.20.jar
--org.objectweb.asm_3.1.0.v200803061910.jar=/usr/share/java/objectweb-asm/asm-all.jar
--org.sat4j.core_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.core.jar
--org.sat4j.pb_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.pb.jar
-\ No newline at end of file
-+org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper.jar
-+org.apache.lucene_1.9.1.v20080530-1600.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
-+org.apache.lucene.analysis_1.9.1.v20080530-1600.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
-+org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest-core.jar
-+org.mortbay.jetty.server_6.1.15.v200905151201.jar=/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty.jar
-+org.mortbay.jetty.util_6.1.15.v200905182336.jar=/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty-util.jar
-+org.objectweb.asm_3.1.0.v200803061910.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
-+org.sat4j.core_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
-+org.sat4j.pb_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
-Index: eclipse-build/nonosgidependencies.properties
-===================================================================
---- eclipse-build/nonosgidependencies.properties       (Revision 24279)
-+++ eclipse-build/nonosgidependencies.properties       (Arbeitskopie)
-@@ -1,20 +1,20 @@
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-antlr.jar=/usr/share/java/ant/ant-antlr.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-bcel.jar=/usr/share/java/ant/ant-apache-bcel.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-bsf.jar=/usr/share/java/ant/ant-apache-bsf.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-log4j.jar=/usr/share/java/ant/ant-apache-log4j.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-oro.jar=/usr/share/java/ant/ant-apache-oro.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-regexp.jar=/usr/share/java/ant/ant-apache-regexp.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-resolver.jar=/usr/share/java/ant/ant-apache-resolver.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-commons-logging.jar=/usr/share/java/ant/ant-commons-logging.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-commons-net.jar=/usr/share/java/ant/ant-commons-net.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-antlr.jar=/usr/share/java/ant/ant-antlr.jar:/usr/share/java/ant-antlr.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-bcel.jar=/usr/share/java/ant/ant-apache-bcel.jar:/usr/share/java/ant-apache-bcel.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-bsf.jar=/usr/share/java/ant/ant-apache-bsf.jar:/usr/share/java/ant-apache-bsf.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-log4j.jar=/usr/share/java/ant/ant-apache-log4j.jar:/usr/share/java/ant-apache-log4j.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-oro.jar=/usr/share/java/ant/ant-apache-oro.jar:/usr/share/java/ant-apache-oro.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-regexp.jar=/usr/share/java/ant/ant-apache-regexp.jar:/usr/share/java/ant-apache-regexp.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-apache-resolver.jar=/usr/share/java/ant/ant-apache-resolver.jar:/usr/share/java/ant-apache-resolver.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-commons-logging.jar=/usr/share/java/ant/ant-commons-logging.jar:/usr/share/java/ant-commons-logging.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-commons-net.jar=/usr/share/java/ant/ant-commons-net.jar:/usr/share/java/ant-commons-net.jar
- org.apache.ant_1.7.1.v20090120-1145/lib/ant.jar=/usr/share/java/ant.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-javamail.jar=/usr/share/java/ant/ant-javamail.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-jdepend.jar=/usr/share/java/ant/ant-jdepend.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-jsch.jar=/usr/share/java/ant/ant-jsch.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-junit.jar=/usr/share/java/ant/ant-junit.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-nodeps.jar=/usr/share/java/ant/ant-nodeps.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar
--org.apache.ant_1.7.1.v20090120-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-javamail.jar=/usr/share/java/ant/ant-javamail.jar:/usr/share/java/ant-javamail.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-jdepend.jar=/usr/share/java/ant/ant-jdepend.jar:/usr/share/java/ant-jdepend.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-jsch.jar=/usr/share/java/ant/ant-jsch.jar:/usr/share/java/ant-jsch.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-junit.jar=/usr/share/java/ant/ant-junit.jar:/usr/share/java/ant-junit.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar:/usr/share/java/ant-launcher.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-nodeps.jar=/usr/share/java/ant/ant-nodeps.jar:/usr/share/java/ant-nodeps.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
-+org.apache.ant_1.7.1.v20090120-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar
- org.junit_3.8.2.v20090203-1005/junit.jar=/usr/share/java/junit.jar
--org.junit4/junit.jar=/usr/share/java/junit4.jar
-\ No newline at end of file
-+org.junit4/junit.jar=/usr/share/java/junit4.jar
diff --git a/dependencies.properties b/dependencies.properties
index afb5a58..0a61a75 100644
--- a/dependencies.properties
+++ b/dependencies.properties
@@ -1,4 +1,4 @@
-com.ibm.icu_4.0.1.v20090822.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/share/java/com.ibm.icu.jar
+com.ibm.icu_4.0.1.v20090822.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar::/usr/share/java/com.ibm.icu.jar
 com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
 
javax.servlet_2.5.0.v200806031605.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar
 
javax.servlet.jsp_2.0.0.v200806031607.jar=/usr/share/java/tomcat5-jsp-2.0-api.jar:/usr/share/java/jsp-api-2.0.jar
@@ -10,8 +10,8 @@ 
org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache
 
org.apache.lucene_1.9.1.v20080530-1600.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
 
org.apache.lucene.analysis_1.9.1.v20080530-1600.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
 
org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest-core.jar
-org.mortbay.jetty.server_6.1.15.v200905151201.jar=/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty.jar
-org.mortbay.jetty.util_6.1.15.v200905182336.jar=/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty-util.jar
+org.mortbay.jetty.server_6.1.15.v200905151201.jar=/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty/jetty.jar
+org.mortbay.jetty.util_6.1.15.v200905182336.jar=/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty/jetty-util.jar
 
org.objectweb.asm_3.1.0.v200803061910.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
 
org.sat4j.core_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
-org.sat4j.pb_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
+org.sat4j.pb_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
\ No newline at end of file
diff --git a/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml 
b/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
index 0b4e3e9..7d2847f 100644
--- a/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
+++ b/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
@@ -305,7 +305,7 @@
          id="org.apache.commons.codec"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.3.0.qualifier"
          unpack="false"/>
 
    <plugin
diff --git a/patches/eclipse-use-newer-commons-codec.patch 
b/patches/eclipse-use-newer-commons-codec.patch
new file mode 100644
index 0000000..340b35a
--- /dev/null
+++ b/patches/eclipse-use-newer-commons-codec.patch
@@ -0,0 +1,11 @@
+--- features/org.eclipse.equinox.p2.user.ui/feature.xml.old    2009-11-06 
21:52:00.000000000 +0200
++++ features/org.eclipse.equinox.p2.user.ui/feature.xml        2010-02-26 
12:25:20.754557749 +0200
+@@ -305,7 +305,7 @@
+          id="org.apache.commons.codec"
+          download-size="0"
+          install-size="0"
+-         version="1.3.0.qualifier"
++         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin


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

_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to