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

[Benjamin Drung]

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  c5c950e6311437485f982baac311cf7cee1e4120 (commit)
       via  6178ea1f58655e154d7c4dbc2bb92d7fc043cad9 (commit)
      from  579c40d4cffd7df32aab1b0d33b4d9443080f735 (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 c5c950e6311437485f982baac311cf7cee1e4120
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Feb 17 02:13:03 2010 +0100

    Enable jetty and jasper (they are already removed).

commit 6178ea1f58655e154d7c4dbc2bb92d7fc043cad9
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Feb 17 02:12:07 2010 +0100

    Fix symlink-system-jars to create missing directories.

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

Summary of changes:
 debian/patches/system-jars.patch |   17 ++++++++++++-----
 symlink-system-jars              |   11 +++++++++--
 system-jars.csv                  |    4 ++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index 0f609c0..e956c21 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -64,7 +64,7 @@ Index: eclipse-3.5.1+repack/symlink-system-jars
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ eclipse-3.5.1+repack/symlink-system-jars	2010-02-16 16:28:12.440203433 +0100
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,108 @@
 +#!/bin/sh
 +set -e
 +
@@ -110,8 +110,8 @@ Index: eclipse-3.5.1+repack/symlink-system-jars
 +
 +		if test -n "$VERBOSE"; then
 +			echo "I: line: $line"
-+			echo "I: column1: $COLUMN1"
-+			echo "I: column2: $COLUMN2"
++			#echo "I: column1: $COLUMN1"
++			#echo "I: column2: $COLUMN2"
 +		fi
 +
 +		# search for existing jar file or files listed in the removed-jar file
@@ -120,6 +120,10 @@ Index: eclipse-3.5.1+repack/symlink-system-jars
 +		REMOVED_JAR=$(cat removed-jars | grep "${GREP_PATTERN}" || true)
 +		ECLIPSE_JAR=$(echo "$EXISTING_JAR\n$REMOVED_JAR" | sort -u | sed '/^$/d')
 +
++		if test -n "$VERBOSE"; then
++			echo "I: to be replaced jar: $ECLIPSE_JAR"
++		fi
++
 +		# sanity check if the to-be-replaced jar exits
 +		if test -n "$ECLIPSE_JAR"; then
 +			if test $(echo "$ECLIPSE_JAR" | wc -l) -gt 1; then
@@ -144,6 +148,9 @@ Index: eclipse-3.5.1+repack/symlink-system-jars
 +					exit 3
 +				fi
 +
++				# create directory if not exists
++				mkdir -p "$(dirname "$ECLIPSE_JAR")"
++
 +				if test -n "$VERBOSE"; then
 +					echo "I: ln -sf $SYSTEM_JAR $ECLIPSE_JAR"
 +				fi
@@ -215,7 +222,7 @@ Index: eclipse-3.5.1+repack/system-jars.csv
 +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.jasper_*.jar;/usr/share/java/jasper.jar
-+#plugins/org.mortbay.jetty_5*.jar;/usr/share/java/org.mortbay.jetty.jar
++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-all.jar
 +plugins/org.eclipse.osgi/osgi/xmlParserAPIs.jar;/usr/share/java/xmlParserAPIs.jar
diff --git a/symlink-system-jars b/symlink-system-jars
index a2050fb..db2e87e 100755
--- a/symlink-system-jars
+++ b/symlink-system-jars
@@ -43,8 +43,8 @@ for line in $CSV_FILE_CONTENT; do
 
 		if test -n "$VERBOSE"; then
 			echo "I: line: $line"
-			echo "I: column1: $COLUMN1"
-			echo "I: column2: $COLUMN2"
+			#echo "I: column1: $COLUMN1"
+			#echo "I: column2: $COLUMN2"
 		fi
 
 		# search for existing jar file or files listed in the removed-jar file
@@ -53,6 +53,10 @@ for line in $CSV_FILE_CONTENT; do
 		REMOVED_JAR=$(cat removed-jars | grep "${GREP_PATTERN}" || true)
 		ECLIPSE_JAR=$(echo "$EXISTING_JAR\n$REMOVED_JAR" | sort -u | sed '/^$/d')
 
+		if test -n "$VERBOSE"; then
+			echo "I: to be replaced jar: $ECLIPSE_JAR"
+		fi
+
 		# sanity check if the to-be-replaced jar exits
 		if test -n "$ECLIPSE_JAR"; then
 			if test $(echo "$ECLIPSE_JAR" | wc -l) -gt 1; then
@@ -77,6 +81,9 @@ for line in $CSV_FILE_CONTENT; do
 					exit 3
 				fi
 
+				# create directory if not exists
+				mkdir -p "$(dirname "$ECLIPSE_JAR")"
+
 				if test -n "$VERBOSE"; then
 					echo "I: ln -sf $SYSTEM_JAR $ECLIPSE_JAR"
 				fi
diff --git a/system-jars.csv b/system-jars.csv
index c34bfd2..6b2de34 100644
--- a/system-jars.csv
+++ b/system-jars.csv
@@ -42,7 +42,7 @@ 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.jasper_*.jar;/usr/share/java/jasper.jar
-#plugins/org.mortbay.jetty_5*.jar;/usr/share/java/org.mortbay.jetty.jar
+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-all.jar
 plugins/org.eclipse.osgi/osgi/xmlParserAPIs.jar;/usr/share/java/xmlParserAPIs.jar


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