[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. da2ead2f96b544aaf16091a54dfe4eea0cab14ec
Niels Thykier
nthykier-guest at alioth.debian.org
Tue Feb 9 21:18:18 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 da2ead2f96b544aaf16091a54dfe4eea0cab14ec (commit)
from c3db130fab3ff5f9fd07d786b0a3f2e8a97f3f85 (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 da2ead2f96b544aaf16091a54dfe4eea0cab14ec
Author: Niels Thykier <niels at thykier.net>
Date: Tue Feb 9 22:17:04 2010 +0100
Added a few more jars and their respective replacements to system-jars.
-----------------------------------------------------------------------
Summary of changes:
debian/patches/system-jars.patch | 30 +++++++++++++++++++++---------
symlink-system-jars | 7 +++++++
system-jars.csv | 19 ++++++++++++-------
3 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index 35d0a62..cc2862c 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -60,7 +60,7 @@ Applied-Upstream: no
--- /dev/null
+++ eclipse-3.5.1+repack/symlink-system-jars
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,98 @@
+#!/bin/sh
+set -e
+
@@ -118,6 +118,13 @@ Applied-Upstream: no
+ echo "$ECLIPSE_JAR" > /dev/stdout
+ exit 1
+ fi
++ if test "xdelete" = "x$COLUMN2" ; then
++ if test -n "$VERBOSE"; then
++ echo "I: rm $ECLIPSE_JAR"
++ fi
++ rm "$ECLIPSE_JAR"
++ continue
++ fi
+
+ # search for system jars
+ SYSTEM_JAR=$(ls -1 $(echo "$COLUMN2" | sed "s/,/ /g") 2> /dev/null || true)
@@ -154,7 +161,7 @@ Applied-Upstream: no
+fi
--- /dev/null
+++ eclipse-3.5.1+repack/system-jars.csv
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,56 @@
+plugins/org.apache.ant_*/bin/ant;/usr/share/ant/bin/ant
+plugins/org.apache.ant_*/bin/antRun;/usr/share/ant/bin/antRun
+plugins/org.apache.ant_*/bin/antRun.pl;/usr/share/ant/bin/antRun.pl
@@ -169,20 +176,20 @@ Applied-Upstream: no
+plugins/org.apache.ant_*/lib/ant-apache-resolver.jar;/usr/share/java/ant-apache-resolver.jar
+plugins/org.apache.ant_*/lib/ant-commons-logging.jar;/usr/share/java/ant-commons-logging.jar
+plugins/org.apache.ant_*/lib/ant-commons-net.jar;/usr/share/java/ant-commons-net.jar
-+plugins/org.apache.ant_*/lib/ant-jai.jar;/usr/share/java/ant-jai.jar
++plugins/org.apache.ant_*/lib/ant-jai.jar;delete
+plugins/org.apache.ant_*/lib/ant-javamail.jar;/usr/share/java/ant-javamail.jar
+plugins/org.apache.ant_*/lib/ant-jdepend.jar;/usr/share/java/ant-jdepend.jar
-+plugins/org.apache.ant_*/lib/ant-jmf.jar;/usr/share/java/ant-jmf.jar
++plugins/org.apache.ant_*/lib/ant-jmf.jar;delete
+plugins/org.apache.ant_*/lib/ant-jsch.jar;/usr/share/java/ant-jsch.jar
+plugins/org.apache.ant_*/lib/ant-junit.jar;/usr/share/java/ant-junit.jar
+plugins/org.apache.ant_*/lib/ant-launcher.jar;/usr/share/java/ant-launcher.jar
-+plugins/org.apache.ant_*/lib/ant-netrexx.jar;/usr/share/java/ant-netrexx.jar
++plugins/org.apache.ant_*/lib/ant-netrexx.jar;delete
+plugins/org.apache.ant_*/lib/ant-nodeps.jar;/usr/share/java/ant-nodeps.jar
-+plugins/org.apache.ant_*/lib/ant-starteam.jar;/usr/share/java/ant-starteam.jar
-+plugins/org.apache.ant_*/lib/ant-stylebook.jar;/usr/share/java/ant-stylebook.jar
++plugins/org.apache.ant_*/lib/ant-starteam.jar;delete
++plugins/org.apache.ant_*/lib/ant-stylebook.jar;delete
+plugins/org.apache.ant_*/lib/ant-swing.jar;/usr/share/java/ant-swing.jar
+plugins/org.apache.ant_*/lib/ant-trax.jar;/usr/share/java/ant-trax.jar
-+plugins/org.apache.ant_*/lib/ant-weblogic.jar;/usr/share/java/ant-weblogic.jar
++plugins/org.apache.ant_*/lib/ant-weblogic.jar;delete
+plugins/org.apache.ant_*/lib/ant.jar;/usr/share/java/ant.jar
+plugins/org.junit_3.*/junit.jar;/usr/share/java/junit.jar
+plugins/com.jcraft.jsch_*.jar;/usr/share/java/jsch.jar
@@ -205,4 +212,9 @@ Applied-Upstream: no
+plugins/com.ibm.icu.base_*.jar;/usr/share/java/com.ibm.icu.base.jar
+plugins/javax.management_*.jar;/usr/share/java/mx4j.jar
+plugins/javax.management.remote_*.jar;/usr/share/java/mx4j-remote.jar
-+#plugins/org.apache.ws.commons.util_*.jar;/usr/share/java/ws-commons-util.jar
++plugins/org.apache.ws.commons.util_*.jar;delete
++#plugins/org.apache.jasper_*.jar;/usr/share/java/jasper.jar
++#plugins/org.mortbay.jetty_5*.jar;/usr/share/java/org.mortbay.jetty.jar
++#plugins/org.objectweb.asm_*.jar;/usr/share/java/asm3.jar
++plugins/org.apache.ws.jaxme_*.jar;delete
++plugins/org.apache.xmlrpc_*.jar;delete
diff --git a/symlink-system-jars b/symlink-system-jars
index f65194e..083a3a8 100755
--- a/symlink-system-jars
+++ b/symlink-system-jars
@@ -55,6 +55,13 @@ for line in $CSV_FILE_CONTENT; do
echo "$ECLIPSE_JAR" > /dev/stdout
exit 1
fi
+ if test "xdelete" = "x$COLUMN2" ; then
+ if test -n "$VERBOSE"; then
+ echo "I: rm $ECLIPSE_JAR"
+ fi
+ rm "$ECLIPSE_JAR"
+ continue
+ fi
# search for system jars
SYSTEM_JAR=$(ls -1 $(echo "$COLUMN2" | sed "s/,/ /g") 2> /dev/null || true)
diff --git a/system-jars.csv b/system-jars.csv
index 6d2f975..255edd9 100644
--- a/system-jars.csv
+++ b/system-jars.csv
@@ -12,20 +12,20 @@ plugins/org.apache.ant_*/lib/ant-apache-regexp.jar;/usr/share/java/ant-apache-re
plugins/org.apache.ant_*/lib/ant-apache-resolver.jar;/usr/share/java/ant-apache-resolver.jar
plugins/org.apache.ant_*/lib/ant-commons-logging.jar;/usr/share/java/ant-commons-logging.jar
plugins/org.apache.ant_*/lib/ant-commons-net.jar;/usr/share/java/ant-commons-net.jar
-plugins/org.apache.ant_*/lib/ant-jai.jar;/usr/share/java/ant-jai.jar
+plugins/org.apache.ant_*/lib/ant-jai.jar;delete
plugins/org.apache.ant_*/lib/ant-javamail.jar;/usr/share/java/ant-javamail.jar
plugins/org.apache.ant_*/lib/ant-jdepend.jar;/usr/share/java/ant-jdepend.jar
-plugins/org.apache.ant_*/lib/ant-jmf.jar;/usr/share/java/ant-jmf.jar
+plugins/org.apache.ant_*/lib/ant-jmf.jar;delete
plugins/org.apache.ant_*/lib/ant-jsch.jar;/usr/share/java/ant-jsch.jar
plugins/org.apache.ant_*/lib/ant-junit.jar;/usr/share/java/ant-junit.jar
plugins/org.apache.ant_*/lib/ant-launcher.jar;/usr/share/java/ant-launcher.jar
-plugins/org.apache.ant_*/lib/ant-netrexx.jar;/usr/share/java/ant-netrexx.jar
+plugins/org.apache.ant_*/lib/ant-netrexx.jar;delete
plugins/org.apache.ant_*/lib/ant-nodeps.jar;/usr/share/java/ant-nodeps.jar
-plugins/org.apache.ant_*/lib/ant-starteam.jar;/usr/share/java/ant-starteam.jar
-plugins/org.apache.ant_*/lib/ant-stylebook.jar;/usr/share/java/ant-stylebook.jar
+plugins/org.apache.ant_*/lib/ant-starteam.jar;delete
+plugins/org.apache.ant_*/lib/ant-stylebook.jar;delete
plugins/org.apache.ant_*/lib/ant-swing.jar;/usr/share/java/ant-swing.jar
plugins/org.apache.ant_*/lib/ant-trax.jar;/usr/share/java/ant-trax.jar
-plugins/org.apache.ant_*/lib/ant-weblogic.jar;/usr/share/java/ant-weblogic.jar
+plugins/org.apache.ant_*/lib/ant-weblogic.jar;delete
plugins/org.apache.ant_*/lib/ant.jar;/usr/share/java/ant.jar
plugins/org.junit_3.*/junit.jar;/usr/share/java/junit.jar
plugins/com.jcraft.jsch_*.jar;/usr/share/java/jsch.jar
@@ -48,4 +48,9 @@ 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/javax.management_*.jar;/usr/share/java/mx4j.jar
plugins/javax.management.remote_*.jar;/usr/share/java/mx4j-remote.jar
-#plugins/org.apache.ws.commons.util_*.jar;/usr/share/java/ws-commons-util.jar
+plugins/org.apache.ws.commons.util_*.jar;delete
+#plugins/org.apache.jasper_*.jar;/usr/share/java/jasper.jar
+#plugins/org.mortbay.jetty_5*.jar;/usr/share/java/org.mortbay.jetty.jar
+#plugins/org.objectweb.asm_*.jar;/usr/share/java/asm3.jar
+plugins/org.apache.ws.jaxme_*.jar;delete
+plugins/org.apache.xmlrpc_*.jar;delete
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list