The following commit has been merged in the master branch:
commit 872cdbdedf59f34ea1bf21fa5a2f4738daf188d8
Author: Jakub Adam <[email protected]>
Date: Sat Aug 11 22:45:57 2012 +0200
Refreshed patches
diff --git a/debian/changelog b/debian/changelog
index dc8c505..3ffae62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ eclipse-emf (2.8.0-1) UNRELEASED; urgency=low
* d/control: set context qualifier to 'dist'.
* Removed d/patches/Unchecked-generic-class-cast.patch
(applied upstream).
+ * Refreshed patches for new upstream release.
-- Jakub Adam <[email protected]> Sat, 11 Aug 2012 20:53:50 +0200
diff --git a/debian/patches/Fedora-eclipse-emf-build-props.patch
b/debian/patches/Fedora-eclipse-emf-build-props.patch
index 97a81dd..823c38f 100644
--- a/debian/patches/Fedora-eclipse-emf-build-props.patch
+++ b/debian/patches/Fedora-eclipse-emf-build-props.patch
@@ -1,124 +1,16 @@
-Description: Exclude irrelevant files from source jars.
-Origin: Fedora, http://cvs.fedoraproject.org/viewvc/rpms/eclipse-emf/devel/
-Author: 2009, Mat Booth <[email protected]>
+From: Debian Java Maintainers <[email protected]>
+Date: Sat, 11 Aug 2012 21:49:38 +0200
+Subject: Fedora-eclipse-emf-build-props
-Index: eclipse-emf/org.eclipse.emf.exporter.html/build.properties
-===================================================================
---- eclipse-emf.orig/org.eclipse.emf.exporter.html/build.properties
2010-02-14 16:52:18.309282370 +0100
-+++ eclipse-emf/org.eclipse.emf.exporter.html/build.properties 2010-02-14
16:52:41.502305913 +0100
-@@ -9,8 +9,4 @@
- source.. = src/
- output.. = bin/
- src.includes = about.html,\
-- .classpath,\
-- .jetproperties,\
-- .project,\
-- .settings/,\
- build.properties
-Index: eclipse-emf/org.eclipse.emf.java/build.properties
-===================================================================
---- eclipse-emf.orig/org.eclipse.emf.java/build.properties 2010-02-14
16:52:18.341298695 +0100
-+++ eclipse-emf/org.eclipse.emf.java/build.properties 2010-02-14
16:52:41.502305913 +0100
-@@ -9,7 +9,4 @@
- source.. = src/
- exclude.. = **/doc-files/**
- src.includes = about.html,\
-- .classpath,\
-- .project,\
-- .settings/,\
- build.properties
-Index: eclipse-emf/org.eclipse.emf.java.edit/build.properties
-===================================================================
---- eclipse-emf.orig/org.eclipse.emf.java.edit/build.properties
2010-02-14 16:52:18.353299692 +0100
-+++ eclipse-emf/org.eclipse.emf.java.edit/build.properties 2010-02-14
16:52:41.510284974 +0100
-@@ -9,7 +9,4 @@
- source.. = src/
- exclude.. = **/doc-files/**
- src.includes = about.html,\
-- .classpath,\
-- .project,\
-- .settings/,\
- build.properties
-Index: eclipse-emf/org.eclipse.emf.java.editor/build.properties
-===================================================================
---- eclipse-emf.orig/org.eclipse.emf.java.editor/build.properties
2010-02-14 16:52:18.381282277 +0100
-+++ eclipse-emf/org.eclipse.emf.java.editor/build.properties 2010-02-14
16:52:41.510284974 +0100
-@@ -9,7 +9,4 @@
- source.. = src/
- exclude.. = **/doc-files/**
- src.includes = about.html,\
-- .classpath,\
-- .project,\
-- .settings/,\
- build.properties
-Index:
eclipse-emf/org.eclipse.emf.examples.generator.validator/build.properties
-===================================================================
----
eclipse-emf.orig/org.eclipse.emf.examples.generator.validator/build.properties
2010-02-14 16:52:18.393281806 +0100
-+++ eclipse-emf/org.eclipse.emf.examples.generator.validator/build.properties
2010-02-14 16:52:41.518282614 +0100
-@@ -9,8 +9,4 @@
- source.. = src/
- output.. = bin/
- src.includes = about.html,\
-- .classpath,\
-- .jetproperties,\
-- .project,\
-- .settings/,\
- build.properties
-Index: eclipse-emf/org.eclipse.emf.examples.library/build.properties
-===================================================================
---- eclipse-emf.orig/org.eclipse.emf.examples.library/build.properties
2010-02-14 16:52:18.429309454 +0100
-+++ eclipse-emf/org.eclipse.emf.examples.library/build.properties
2010-02-14 16:52:41.526283117 +0100
-@@ -7,7 +7,4 @@
- source.. = src/
- output.. = bin/
- src.includes = about.html,\
-- .classpath,\
-- .project,\
-- .settings/,\
- build.properties
-Index: eclipse-emf/org.eclipse.emf.examples.library.edit/build.properties
-===================================================================
---- eclipse-emf.orig/org.eclipse.emf.examples.library.edit/build.properties
2010-02-14 16:52:18.441282096 +0100
-+++ eclipse-emf/org.eclipse.emf.examples.library.edit/build.properties
2010-02-14 16:52:41.534283200 +0100
-@@ -7,7 +7,4 @@
- source.. = src/
- output.. = bin/
- src.includes = about.html,\
-- .classpath,\
-- .project,\
-- .settings/,\
- build.properties
-Index: eclipse-emf/org.eclipse.emf.examples.library.editor/build.properties
-===================================================================
---- eclipse-emf.orig/org.eclipse.emf.examples.library.editor/build.properties
2010-02-14 16:52:18.453283862 +0100
-+++ eclipse-emf/org.eclipse.emf.examples.library.editor/build.properties
2010-02-14 16:52:41.542302770 +0100
-@@ -7,7 +7,4 @@
- source.. = src/
- output.. = bin/
- src.includes = about.html,\
-- .classpath,\
-- .project,\
-- .settings/,\
- build.properties
-Index: eclipse-emf/org.eclipse.xsd.example/build.properties
-===================================================================
---- eclipse-emf.orig/org.eclipse.xsd.example/build.properties 2010-02-14
16:52:18.473281662 +0100
-+++ eclipse-emf/org.eclipse.xsd.example/build.properties 2010-02-14
16:52:41.554285470 +0100
-@@ -9,9 +9,6 @@
- plugin.properties,\
- META-INF/
- src.includes = about.html,\
-- .classpath,\
-- .project,\
-- .settings/,\
- build.properties
- source.. = src/
- output.. = bin/
-Index: eclipse-emf/org.eclipse.emf.importer.java/build.properties
-===================================================================
---- eclipse-emf.orig/org.eclipse.emf.importer.java/build.properties
2010-02-14 16:52:18.485282801 +0100
-+++ eclipse-emf/org.eclipse.emf.importer.java/build.properties 2010-02-14
16:52:41.554285470 +0100
-@@ -6,7 +6,6 @@
+---
+ plugins/org.eclipse.emf.importer.java/build.properties | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plugins/org.eclipse.emf.importer.java/build.properties
b/plugins/org.eclipse.emf.importer.java/build.properties
+index 808bebb..858c034 100644
+--- a/plugins/org.eclipse.emf.importer.java/build.properties
++++ b/plugins/org.eclipse.emf.importer.java/build.properties
+@@ -6,7 +6,6 @@ bin.includes = about.html,\
META-INF/,\
ant_tasks/importer.java.tasks.jar
src.includes = about.html,\
diff --git a/debian/patches/Fedora-eclipse-emf-bundle-examples.patch
b/debian/patches/Fedora-eclipse-emf-bundle-examples.patch
index 343d4a9..d69385f 100644
--- a/debian/patches/Fedora-eclipse-emf-bundle-examples.patch
+++ b/debian/patches/Fedora-eclipse-emf-bundle-examples.patch
@@ -1,48 +1,15 @@
-Description: Handle the examples being present rather than being fetched from
CVS.
-Origin: Fedora, http://cvs.fedoraproject.org/viewvc/rpms/eclipse-emf/devel/
-Author: 2009, Mat Booth <[email protected]>
+From: Debian Java Maintainers <[email protected]>
+Date: Sat, 11 Aug 2012 21:49:38 +0200
+Subject: Fedora-eclipse-emf-bundle-examples
-Index: eclipse-emf/org.eclipse.xsd.example.installer/customBuildCallbacks.xml
-===================================================================
----
eclipse-emf.orig/org.eclipse.xsd.example.installer/customBuildCallbacks.xml
2010-02-14 16:52:17.102281917 +0100
-+++ eclipse-emf/org.eclipse.xsd.example.installer/customBuildCallbacks.xml
2010-02-14 16:52:47.717283314 +0100
-@@ -18,26 +18,15 @@
- <!--
===================================================================== -->
-
- <target name="pre.build.jars">
-- <!-- ${build.result.folder} =
/home/www-data/build/emf/downloads/drops/2.4.0/N200805051552/eclipse/plugins/org.eclipse.emf.example.installer
-->
-- <property file="${build.result.folder}/../../../build.cfg" />
-- <condition property="exampleCVSTag"
value="build_${buildTimestamp}" else="${branch}">
-- <istrue value="${tagBuild}"/>
-- </condition>
-- <echo message="Checking out
org.eclipse.mdt/org.eclipse.xsd/examples from ${exampleCVSTag} ..."/>
-- <cvs failonerror="true" dest="${build.result.folder}/examples"
cvsroot=":pserver:[email protected]:/cvsroot/modeling">
-- <commandline>
-- <argument line="-Q export -r ${exampleCVSTag}
org.eclipse.mdt/org.eclipse.xsd/examples" />
-- </commandline>
-- </cvs>
--
-- <move todir="${build.result.folder}/examples/"
includeemptydirs="true">
-- <fileset
dir="${build.result.folder}/examples/org.eclipse.mdt/org.eclipse.xsd/examples/">
-+ <echo message="Copying example plugin projects ..."/>
-+ <copy
todir="${build.result.folder}/examples/org.eclipse.xsd.example"
includeemptydirs="true" failonerror="true">
-+ <fileset
dir="${build.result.folder}/../org.eclipse.xsd.example/">
- <exclude name="**/.cvsignore" />
-+ <exclude name="**/javaCompiler...args" />
-+ <exclude name="**/build.xml" />
- <exclude name="**/build/**" />
- </fileset>
-- </move>
--
-- <delete dir="${build.result.folder}/examples/org.eclipse.mdt" />
-+ </copy>
- </target>
-
-
-Index: eclipse-emf/org.eclipse.emf.example.installer/customBuildCallbacks.xml
-===================================================================
----
eclipse-emf.orig/org.eclipse.emf.example.installer/customBuildCallbacks.xml
2010-02-14 16:52:17.150293877 +0100
-+++ eclipse-emf/org.eclipse.emf.example.installer/customBuildCallbacks.xml
2010-02-14 16:52:47.717283314 +0100
+---
+ .../customBuildCallbacks.xml | 90 +++++++++++++++-----
+ 1 file changed, 71 insertions(+), 19 deletions(-)
+
+diff --git
a/plugins/org.eclipse.emf.example.installer/customBuildCallbacks.xml
b/plugins/org.eclipse.emf.example.installer/customBuildCallbacks.xml
+index 10fd915..1958752 100644
+--- a/plugins/org.eclipse.emf.example.installer/customBuildCallbacks.xml
++++ b/plugins/org.eclipse.emf.example.installer/customBuildCallbacks.xml
@@ -18,27 +18,79 @@
<!--
===================================================================== -->
@@ -61,21 +28,19 @@ Index:
eclipse-emf/org.eclipse.emf.example.installer/customBuildCallbacks.xml
-
- <move todir="${build.result.folder}/examples/"
includeemptydirs="true">
- <fileset
dir="${build.result.folder}/examples/org.eclipse.emf/org.eclipse.emf/examples/">
-- <exclude name="**/.cvsignore" />
-- </fileset>
-- </move>
--
-- <delete dir="${build.result.folder}/examples/org.eclipse.emf" />
-- <delete
dir="${build.result.folder}/examples/org.eclipse.emf.examples" />
-- <delete
dir="${build.result.folder}/examples/org.eclipse.emf.examples-feature" />
+ <echo message="Copying example plugin projects ..."/>
+ <copy
todir="${build.result.folder}/examples/org.eclipse.emf.activities"
includeemptydirs="true" failonerror="true">
+ <fileset
dir="${build.result.folder}/../org.eclipse.emf.activities/">
-+ <exclude name="**/.cvsignore" />
+ <exclude name="**/.cvsignore" />
+ <exclude name="**/javaCompiler...args" />
+ <exclude name="**/build.xml" />
+ <exclude name="**/build/**" />
-+ </fileset>
+ </fileset>
+- </move>
+-
+- <delete dir="${build.result.folder}/examples/org.eclipse.emf" />
+- <delete
dir="${build.result.folder}/examples/org.eclipse.emf.examples" />
+- <delete
dir="${build.result.folder}/examples/org.eclipse.emf.examples-feature" />
+ </copy>
+ <copy
todir="${build.result.folder}/examples/org.eclipse.emf.examples.generator.validator"
includeemptydirs="true" failonerror="true">
+ <fileset
dir="${build.result.folder}/../org.eclipse.emf.examples.generator.validator/">
diff --git a/debian/patches/Fedora-eclipse-emf-make-homeless.patch
b/debian/patches/Fedora-eclipse-emf-make-homeless.patch
index 15a1188..2961937 100644
--- a/debian/patches/Fedora-eclipse-emf-make-homeless.patch
+++ b/debian/patches/Fedora-eclipse-emf-make-homeless.patch
@@ -1,12 +1,16 @@
-Description: Stop the javadoc generatings from setting ANT_HOME/JAVA_HOME
-Origin: Fedora, http://cvs.fedoraproject.org/viewvc/rpms/eclipse-emf/devel/
-Author: 2009, Mat Booth <[email protected]>
+From: Debian Java Maintainers <[email protected]>
+Date: Sat, 11 Aug 2012 21:49:38 +0200
+Subject: Fedora-eclipse-emf-make-homeless
-Index: eclipse-emf/org.eclipse.emf.doc/build/antJavadoc.sh
-===================================================================
---- eclipse-emf.orig/org.eclipse.emf.doc/build/antJavadoc.sh 2010-02-14
16:52:30.230304463 +0100
-+++ eclipse-emf/org.eclipse.emf.doc/build/antJavadoc.sh 2010-02-14
16:52:33.206306654 +0100
-@@ -12,9 +12,9 @@
+---
+ doc/org.eclipse.emf.doc/build/antJavadoc.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/doc/org.eclipse.emf.doc/build/antJavadoc.sh
b/doc/org.eclipse.emf.doc/build/antJavadoc.sh
+index bec16e3..ba974d5 100644
+--- a/doc/org.eclipse.emf.doc/build/antJavadoc.sh
++++ b/doc/org.eclipse.emf.doc/build/antJavadoc.sh
+@@ -12,9 +12,9 @@ pluginName="org.eclipse.emf";
debug=0; if [[ $debug -gt 0 ]]; then echo "[antJd] debug: "$debug; fi
@@ -19,20 +23,10 @@ Index: eclipse-emf/org.eclipse.emf.doc/build/antJavadoc.sh
# current directory - all but the name of this script, no trailing slash
currentPath=$PWD"/"$0; currentPath=${currentPath%/*}; if [[ $debug -gt 0 ]];
then echo "[antJd] currentPath: "$currentPath; fi
-Index: eclipse-emf/org.eclipse.xsd.doc/build/antJavadoc.sh
-===================================================================
---- eclipse-emf.orig/org.eclipse.xsd.doc/build/antJavadoc.sh 2010-02-14
16:52:30.266282594 +0100
-+++ eclipse-emf/org.eclipse.xsd.doc/build/antJavadoc.sh 2010-02-14
16:52:33.206306654 +0100
-@@ -12,9 +12,9 @@
-
- debug=0; if [ $debug -gt 0 ]; then echo "[antJd] debug: "$debug; fi
-
--if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
--if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
--export PATH=${PATH}:${ANT_HOME}/bin
-+#if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
-+#if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
-+#export PATH=${PATH}:${ANT_HOME}/bin
-
- # current directory - all but the name of this script, no trailing slash
- currentPath=$PWD"/"$0; currentPath=${currentPath%/*}; if [[ $debug -gt 0 ]];
then echo "[antJd] currentPath: "$currentPath; fi
+@@ -161,4 +161,4 @@ for packSum in `find $destDir -name "package-summary.html"
| sort`; do
+ done
+ echo ' </topic>' >> $trXML;
+ echo '</toc>' >> $trXML;
+-
+\ No newline at end of file
++
diff --git a/debian/patches/Fedora-eclipse-emf-platform-docs-location.patch
b/debian/patches/Fedora-eclipse-emf-platform-docs-location.patch
index a6b20d9..ea9493c 100644
--- a/debian/patches/Fedora-eclipse-emf-platform-docs-location.patch
+++ b/debian/patches/Fedora-eclipse-emf-platform-docs-location.patch
@@ -1,24 +1,15 @@
-Description: Correct path for eclipse javadoc.
-Origin: Fedora, http://cvs.fedoraproject.org/viewvc/rpms/eclipse-emf/devel/
-Author: 2009, Mat Booth <[email protected]>
+From: Debian Java Maintainers <[email protected]>
+Date: Sat, 11 Aug 2012 21:49:38 +0200
+Subject: Fedora-eclipse-emf-platform-docs-location
-Index: eclipse-emf/org.eclipse.emf.doc/build/javadoc.xml.template
-===================================================================
---- eclipse-emf.orig/org.eclipse.emf.doc/build/javadoc.xml.template
2010-02-14 16:52:29.458285044 +0100
-+++ eclipse-emf/org.eclipse.emf.doc/build/javadoc.xml.template 2010-02-14
16:52:36.366282819 +0100
-@@ -12,7 +12,7 @@
- <available property="platformJavadocExists"
file="${javadoc.link.location}/platform/"/>
-
- <target name="extractPlatformJavadoc" unless="platformJavadocExists">
-- <unzip
src="${eclipseDir}/plugins/org.eclipse.platform.doc.isv.jar"
dest="${javadoc.link.location}/platform/"/>
-+ <unzip dest="${javadoc.link.location}/platform/"><fileset
dir="${eclipseDir}/SDK/plugins"><include
name="org.eclipse.platform.doc.isv_*.jar"/></fileset></unzip>
- </target>
-
- <target name="javadoc" depends="extractPlatformJavadoc">
-Index: eclipse-emf/org.eclipse.xsd.doc/build/javadoc.xml.template
-===================================================================
---- eclipse-emf.orig/org.eclipse.xsd.doc/build/javadoc.xml.template
2010-02-14 16:52:29.470281433 +0100
-+++ eclipse-emf/org.eclipse.xsd.doc/build/javadoc.xml.template 2010-02-14
16:52:36.366282819 +0100
+---
+ doc/org.eclipse.emf.doc/build/javadoc.xml.template | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/org.eclipse.emf.doc/build/javadoc.xml.template
b/doc/org.eclipse.emf.doc/build/javadoc.xml.template
+index e162957..4564459 100644
+--- a/doc/org.eclipse.emf.doc/build/javadoc.xml.template
++++ b/doc/org.eclipse.emf.doc/build/javadoc.xml.template
@@ -12,7 +12,7 @@
<available property="platformJavadocExists"
file="${javadoc.link.location}/platform/"/>
diff --git a/debian/patches/Fedora-eclipse-emf-symlinked-classpath.patch
b/debian/patches/Fedora-eclipse-emf-symlinked-classpath.patch
index aaf1b94..35fa9ca 100644
--- a/debian/patches/Fedora-eclipse-emf-symlinked-classpath.patch
+++ b/debian/patches/Fedora-eclipse-emf-symlinked-classpath.patch
@@ -1,44 +1,21 @@
-Description: Correct classpath for javadoc generation.
-Origin: Fedora, http://cvs.fedoraproject.org/viewvc/rpms/eclipse-emf/devel/
-Author: 2009, Mat Booth <[email protected]>
+From: Debian Java Maintainers <[email protected]>
+Date: Sat, 11 Aug 2012 21:49:38 +0200
+Subject: Fedora-eclipse-emf-symlinked-classpath
-Index: eclipse-emf/org.eclipse.emf.doc/build/antJavadoc.sh
-===================================================================
---- eclipse-emf.orig/org.eclipse.emf.doc/build/antJavadoc.sh 2010-02-14
16:52:33.206306654 +0100
-+++ eclipse-emf/org.eclipse.emf.doc/build/antJavadoc.sh 2010-02-14
16:52:39.077283293 +0100
-@@ -94,13 +94,13 @@
- # The directory of the plugins in the order they were built
- excludes="resources.jar";
- includes="${pluginName}";
--pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n
| egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e
's/\(\/.*\)\/.*/\1/'`
-+pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort
-n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e
's/\(\/.*\)\/.*/\1/'`
-
- ### TODO: missing emf/xsd plugins (?) in $eclipseDir - need to copy them over
or reference source (?)
+---
+ doc/org.eclipse.emf.doc/build/antJavadoc.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/org.eclipse.emf.doc/build/antJavadoc.sh
b/doc/org.eclipse.emf.doc/build/antJavadoc.sh
+index ba974d5..ee8cf34 100644
+--- a/doc/org.eclipse.emf.doc/build/antJavadoc.sh
++++ b/doc/org.eclipse.emf.doc/build/antJavadoc.sh
+@@ -100,7 +100,7 @@ pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf
'%T@ %p\n' | sort -n
### so that all classes/packages (and thus @links) can be resolved
# All the jars in the plugins directory
--classpath=`find $eclipseDir/plugins \( -name "*.jar" -type f \) -o \( -name
'@dot' -type d \) | tr '\n' ':'`;
+-classpath=`find -L $eclipseDir/plugins \( -name "*.jar" -type f \) -o \(
-name '@dot' -type d \) | tr '\n' ':'`;
+classpath=`find -L $eclipseDir/plugins $eclipseDir/SDK/plugins \( -name
"*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`;
if [[ $debug -gt 1 ]]; then echo "Got classpath: "; echo $classpath | perl
-pe "s#:#\n\t:#g"; fi
# Calculates the packagesets and the calls to copyDocFiles (used in
${antScript}.template)
-Index: eclipse-emf/org.eclipse.xsd.doc/build/antJavadoc.sh
-===================================================================
---- eclipse-emf.orig/org.eclipse.xsd.doc/build/antJavadoc.sh 2010-02-14
16:52:33.206306654 +0100
-+++ eclipse-emf/org.eclipse.xsd.doc/build/antJavadoc.sh 2010-02-14
16:52:39.077283293 +0100
-@@ -72,13 +72,13 @@
- # The directory of the plugins in the order they were built
- excludes="resources.jar";
- includes="org.eclipse.xsd|org.eclipse.emf.mapping.xsd2ecore";
--pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n
| egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e
's/\(\/.*\)\/.*/\1/'`
-+pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort
-n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e
's/\(\/.*\)\/.*/\1/'`
-
- ### TODO: missing emf/xsd plugins (?) in $eclipseDir - need to copy them over
or reference source (?)
- ### so that all classes/packages (and thus @links) can be resolved
-
- # All the jars in the plugins directory
--classpath=`find $eclipseDir/plugins \( -name "*.jar" -type f \) -o \( -name
'@dot' -type d \) | tr '\n' ':'`;
-+classpath=`find -L $eclipseDir/plugins $eclipseDir/SDK/plugins \( -name
"*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`;
- if [ $debug -gt 1 ]; then echo "Got classpath: "; echo $classpath | perl -pe
"s#:#\n\t:#g"; fi
-
- # Calculates the packagesets and the calls to copyDocFiles (used in
${antScript}.template)
diff --git a/debian/patches/unix2dos.patch b/debian/patches/unix2dos.patch
index 89dfca1..19b6313 100644
--- a/debian/patches/unix2dos.patch
+++ b/debian/patches/unix2dos.patch
@@ -1,23 +1,15 @@
-Description: Replace dos2unix with fromdos.
-Author: Niels Thykier <[email protected]>
+From: Debian Java Maintainers <[email protected]>
+Date: Sat, 11 Aug 2012 21:49:38 +0200
+Subject: unix2dos
-diff --git a/org.eclipse.emf.doc/build/antJavadoc.sh
b/org.eclipse.emf.doc/build/antJavadoc.sh
-index 2505a6f..2c73574 100644
---- a/org.eclipse.emf.doc/build/antJavadoc.sh
-+++ b/org.eclipse.emf.doc/build/antJavadoc.sh
-@@ -46,7 +46,7 @@ function groupPackage
- done
- fi
- if [[ $debug -gt 1 ]]; then echo "[antJd] *.java in
srcDir: "; echo "-----------------"; find $srcDir -type f -name '*.java'; echo
"-----------------"; fi
-- packages=`find $srcDir -type f -name '*.java' -exec
grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);/\1/' | sed -e 's/[
]*//g' | dos2unix | sort | uniq | xargs | sed -e 's/ /:/g'`;
-+ packages=`find $srcDir -type f -name '*.java' -exec
grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);/\1/' | sed -e 's/[
]*//g' | fromdos | sort | uniq | xargs | sed -e 's/ /:/g'`;
- # packages=`find $srcDir -type f -name '*.java' -exec
grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);.*/\1/' | sort | uniq
| xargs | sed -e 's/ /:/g'` # old way
- if [[ $debug -gt 1 ]]; then echo "[antJd] packages1:
"$packages; fi
- packages=`echo $packages | sed -e 's/\//\\\\\\//g' |
sed -e 's/\./\\\\\./g'`; # slash escape
-diff --git a/org.eclipse.xsd.doc/build/antJavadoc.sh
b/org.eclipse.xsd.doc/build/antJavadoc.sh
-index 0273db5..b3b5fbd 100644
---- a/org.eclipse.xsd.doc/build/antJavadoc.sh
-+++ b/org.eclipse.xsd.doc/build/antJavadoc.sh
+---
+ doc/org.eclipse.emf.doc/build/antJavadoc.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/org.eclipse.emf.doc/build/antJavadoc.sh
b/doc/org.eclipse.emf.doc/build/antJavadoc.sh
+index ee8cf34..761f30c 100644
+--- a/doc/org.eclipse.emf.doc/build/antJavadoc.sh
++++ b/doc/org.eclipse.emf.doc/build/antJavadoc.sh
@@ -46,7 +46,7 @@ function groupPackage
done
fi
--
eclipse-emf - Plug-in for eclipse - Debian package.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
