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

[Niels Thykier]

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  801427258c6f4a7a7204599a1116bb2f7cc9bfe6 (commit)
       via  2757e2911b81af99cc40566130a9d6f9facd0e05 (commit)
      from  0f15371e18e32c0a496eb0e4c7ec53a580727318 (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 801427258c6f4a7a7204599a1116bb2f7cc9bfe6
Merge: 2757e2911b81af99cc40566130a9d6f9facd0e05 0f15371e18e32c0a496eb0e4c7ec53a580727318
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jan 9 20:03:37 2010 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-java/eclipse

commit 2757e2911b81af99cc40566130a9d6f9facd0e05
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jan 9 20:03:12 2010 +0100

    Added commons-codec to system-jars

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

Summary of changes:
 debian/patches/codec.patch                         |   13 +++++++++++++
 debian/patches/series                              |    1 +
 debian/patches/system-jars.patch                   |    2 +-
 .../org.eclipse.equinox.p2.user.ui/feature.xml     |    2 +-
 system-jars.csv                                    |    2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/patches/codec.patch b/debian/patches/codec.patch
new file mode 100644
index 0000000..9ce7914
--- /dev/null
+++ b/debian/patches/codec.patch
@@ -0,0 +1,13 @@
+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 8a34d35..6bac392 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="1.3.0.qualifier"
++         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
diff --git a/debian/patches/series b/debian/patches/series
index 26a38b5..9aa47a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ remove-eclipse-version.patch
 move-config-file-to-etc.patch
 fix-directory-in-eclipse-ini.patch
 system-jars.patch
+codec.patch
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index d914a5d..959308b 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -189,7 +189,7 @@ Applied-Upstream: no
 +plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.0.jar
 +plugins/javax.servlet_2.4*.jar;/usr/share/java/servlet-api-2.4.jar
 +plugins/javax.servlet_2.5*.jar;/usr/share/java/servlet-api-2.5.jar
-+#plugins/org.apache.commons.codec_*.jar;/usr/share/java/commons-codec.jar
++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
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 8a34d35..6bac392 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="1.3.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
diff --git a/system-jars.csv b/system-jars.csv
index 156da8d..115c89c 100644
--- a/system-jars.csv
+++ b/system-jars.csv
@@ -32,7 +32,7 @@ plugins/com.jcraft.jsch_*.jar;/usr/share/java/jsch.jar
 plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.0.jar
 plugins/javax.servlet_2.4*.jar;/usr/share/java/servlet-api-2.4.jar
 plugins/javax.servlet_2.5*.jar;/usr/share/java/servlet-api-2.5.jar
-#plugins/org.apache.commons.codec_*.jar;/usr/share/java/commons-codec.jar
+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


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