.gitignore

+*.swp
+*/*/target/

debian/build.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+
+  <include file="/usr/share/eclipse-debian-helper/build-eclipse-bundle.xml"/>
+
+   <!-- Eclipse EMF Common -->
+  <target name="org.eclipse.emf.common">
+    <make-bundle name="org.eclipse.emf.common" basedir="plugins">
+      <pathelement path="/usr/share/java/equinox-common.jar"/>
+      <pathelement path="/usr/share/java/eclipse-core-runtime.jar"/>
+    </make-bundle>
+  </target>
+
+   <!-- Eclipse EMF Ecore -->
+  <target name="org.eclipse.emf.ecore" depends="org.eclipse.emf.common">
+    <make-bundle name="org.eclipse.emf.ecore" basedir="plugins" depends="org.eclipse.emf.common">
+      <pathelement path="/usr/share/java/eclipse-core-contenttype.jar"/>
+      <pathelement path="/usr/share/java/equinox-registry.jar"/>
+      <pathelement path="/usr/share/java/eclipse-core-resources.jar"/>
+      <pathelement path="/usr/share/java/equinox-common.jar"/>
+      <pathelement path="/usr/share/java/eclipse-core-runtime.jar"/>
+      <pathelement path="/usr/share/java/equinox-preferences.jar"/>
+      <pathelement path="/usr/share/java/eclipse-core-jobs.jar"/>
+    </make-bundle>
+  </target>
+
+   <!-- Eclipse EMF XML/XMI Persistence -->
+  <target name="org.eclipse.emf.ecore.xmi" depends="org.eclipse.emf.ecore,org.eclipse.emf.common">
+    <make-bundle name="org.eclipse.emf.ecore.xmi" basedir="plugins" depends="org.eclipse.emf.ecore,org.eclipse.emf.common">
+      <pathelement path="/usr/share/java/eclipse-core-runtime.jar"/>
+      <pathelement path="/usr/share/java/equinox-registry.jar"/>
+      <pathelement path="/usr/share/java/equinox-common.jar"/>
+      <pathelement path="/usr/share/java/eclipse-core-contenttype.jar"/>
+    </make-bundle>
+  </target>
+
+</project>

debian/bundles

+plugins/org.eclipse.emf.common
+plugins/org.eclipse.emf.ecore
+plugins/org.eclipse.emf.ecore.xmi

debian/changelog

-eclipse-emf (2.8.3-3) UNRELEASED; urgency=medium
+eclipse-emf (2.14.0-1) unstable; urgency=medium
 
   [ Jelmer Vernooij ]
   * Use correct machine-readable copyright file URI.
@@ -10,7 +10,11 @@ eclipse-emf (2.8.3-3) UNRELEASED; urgency=medium
   * Use XZ compression for the upstream tarball
   * Use the Files-Excluded field to remove the JET tutorial
 
- -- Jelmer Vernooij <jelmer@debian.org>  Fri, 14 Sep 2018 00:15:42 +0100
+  [ Jochen Sprickerhof ]
+  * New upstream release
+  * Rework packaging using eclipse-debian-helper
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 19 Oct 2018 14:37:18 +0200
 
 eclipse-emf (2.8.3-2) unstable; urgency=medium
 

debian/control

@@ -2,49 +2,48 @@ Source: eclipse-emf
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Jakub Adam <jakub.adam@ktknet.cz>
-Build-Depends: debhelper (>= 11),
+Uploaders: Jakub Adam <jakub.adam@ktknet.cz>, Jochen Sprickerhof <jspricke@debian.org>
+Build-Depends:
+ debhelper (>= 11),
  default-jdk,
-               eclipse-pde (>= 3.5.2),
-               eclipse-platform (>= 3.5.2),
-               javahelper (>= 0.31~),
-               tofrodos,
-               unzip,
-               zip
+ eclipse-debian-helper (>= 1.4~),
+ libeclipse-core-resources-java,
+ libeclipse-osgi-java,
 Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/eclipse-emf.git
 Vcs-Browser: https://salsa.debian.org/java-team/eclipse-emf
 Homepage: http://www.eclipse.org/emf
 
-Package: eclipse-emf
+Package: libeclipse-emf-common-java
 Architecture: all
-Depends: default-jre | java5-runtime | java6-runtime,
-         eclipse-platform (>= 3.5.2),
-         ${misc:Depends}
-Description: Eclipse Modeling Framework (EMF)
+Depends: ${misc:Depends}, ${bundle:Depends}, libequinox-common-java, libeclipse-core-contenttype-java,
+Description: Eclipse Modeling Framework (EMF) Common
  The Eclipse Modeling Framework (EMF) allows developers to build tools and
  other applications based on a structured data model. From a model
  specification described in XMI, EMF provides tools and runtime support to
  produce a set of Java classes for the model, along with a set of adapter
  classes that enable viewing and command-based editing of the model, and a
  basic editor.
+ .
+ This package contains the org.eclipse.emf.common bundle.
 
-Package: eclipse-emf-examples
+Package: libeclipse-emf-ecore-java
 Architecture: all
-Depends: default-jre | java5-runtime | java6-runtime,
-         eclipse-emf (= ${source:Version}),
-         ${misc:Depends}
-Description: Eclipse EMF examples
- Installable versions of the example projects from the SDKs that demonstrate how
- to use the Eclipse Modeling Framework (EMF) plugin.
+Depends: ${misc:Depends}, ${bundle:Depends}, libeclipse-core-resources-java,
+Description: Eclipse Modeling Framework (EMF) Ecore
+ The Eclipse Modeling Framework (EMF) allows developers to build tools and
+ other applications based on a structured data model. From a model
+ specification described in XMI, EMF provides tools and runtime support to
+ produce a set of Java classes for the model, along with a set of adapter
+ classes that enable viewing and command-based editing of the model, and a
+ basic editor.
+ .
+ This package contains the org.eclipse.emf.ecore bundle.
 
-Package: eclipse-emf-sdk
+Package: libeclipse-emf-ecore-xmi-java
 Architecture: all
-Depends: default-jre | java5-runtime | java6-runtime,
-         eclipse-emf (= ${source:Version}),
-         eclipse-pde (>= 3.5.2),
-         ${misc:Depends}
-Description: Eclipse Modeling Framework (EMF) - (Source/Documentation)
+Depends: ${misc:Depends}, ${bundle:Depends}, libeclipse-core-contenttype-java, libeclipse-core-runtime-java, libequinox-registry-java,
+Description: Eclipse Modeling Framework (EMF) XML/XMI Persistence
  The Eclipse Modeling Framework (EMF) allows developers to build tools and
  other applications based on a structured data model. From a model
  specification described in XMI, EMF provides tools and runtime support to
@@ -52,4 +51,4 @@ Description: Eclipse Modeling Framework (EMF) - (Source/Documentation)
  classes that enable viewing and command-based editing of the model, and a
  basic editor.
  .
- Documentation and source for the Eclipse Modeling Framework (EMF).
+ This package contains the org.eclipse.emf.ecore.xmi bundle.

debian/copyright

@@ -21,141 +21,6 @@ Files: debian/*
 Copyright: 2010, Debian Orbital Alignment Team <pkg-java-maintainers@lists.alioth.debian.org>
 License: EPL-1.0
 
-Files: debian/patches/Fedora-*.patch
-Copyright: 2009, Mat Booth <fedora@matbooth.co.uk>
-           2009, Alexander Kurtakov <akurtako@redhat.com>
-License: Fedora-contribution
- The file was downloaded from Fedora's CVS repository; all committers
- are required to sign a license agreement with Fedora, which puts
- contributions without a license under the license included below.
- .
- At the time Debian acquired these files, the "default" Fedora license
- was:
- .
- The Fedora Project Individual Contributor License Agreement
- .
- The Fedora Project
- .
- Individual Contributor License Agreement (CLA)
- .
- http://fedoraproject.org/wiki/Legal/Licenses/CLA
- .
- Thank you for your interest in The Fedora Project (the "Project"). In
- order to clarify the intellectual property license granted with
- Contributions from any person or entity, Red Hat, Inc. ("Red Hat"),
- as maintainer of the Project, must have a Contributor License
- Agreement (CLA) on file that has been signed by each Contributor,
- indicating agreement to the license terms below. This license is for
- Your protection as a Contributor as well as the protection of the
- Project and its users; it does not change your rights to use your own
- Contributions for any other purpose.
- .
- You and the Project hereby accept and agree to the following terms
- and conditions:
- .
- * 1. Contributors and Contributions.
- .
-   * A. The Project and any individual or legal entity that
-     voluntarily submits to the Project a Contribution are
-     collectively addressed herein as "Contributors". For legal
-     entities, the entity making a Contribution and all other entities
-     that control, are controlled by, or are under common control with
-     that entity are considered to be a single Contributor. For the
-     purposes of this definition, "control" means (i) the power,
-     direct or indirect, to cause the direction or management of such
-     entity, whether by contract or otherwise, or (ii) ownership of
-     fifty percent (50%) or more of the outstanding shares, or (iii)
-     beneficial ownership of such entity.
- .
-   * B. A "Contribution" is any original work, including any
-     modification or addition to an existing work, that has been
-     submitted for inclusion in, or documentation of, any of the
-     products owned or managed by the Project, where such work
-     originates from that particular Contributor or from some entity
-     acting on behalf of that Contributor.
- .
-   * C. A Contribution is "submitted" when any form of electronic,
-     verbal, or written communication is sent to the Project,
-     including but not limited to communication on electronic mailing
-     lists, source code control systems, and issue tracking systems
-     that are managed by, or on behalf of, the Project for the purpose
-     of discussing or improving software or documentation of the
-     Project, but excluding communication that is conspicuously marked
-     or otherwise designated in writing by you as "Not a
-     Contribution."
- .
-   * D. Any Contribution submitted by you to the Project shall be
-     under the terms and conditions of this License, without any
-     additional terms or conditions, unless you explicitly state
-     otherwise in the submission.
- .
- * 2. Contributor Grant of License. You hereby grant to Red Hat, Inc.,
-   on behalf of the Project, and to recipients of software distributed
-   by the Project:
- .
-   * (a) a perpetual, non-exclusive, worldwide, fully paid-up, royalty
-     free, irrevocable copyright license to reproduce, prepare
-     derivative works of, publicly display, publicly perform,
-     sublicense, and distribute your Contribution and such derivative
-     works; and,
- .
-   * (b) a perpetual, non-exclusive, worldwide, fully paid-up, royalty
-     free, irrevocable (subject to Section 3) patent license to make,
-     have made, use, offer to sell, sell, import, and otherwise
-     transfer your Contribution and derivative works thereof, where
-     such license applies only to those patent claims licensable by
-     you that are necessarily infringed by your Contribution alone or
-     by combination of your Contribution with the work to which you
-     submitted the Contribution.  Except for the license granted in
-     this section, you reserve all right, title and interest in and to
-     your Contributions.
- .
- * 3. Reciprocity. As of the date any such litigation is filed, your
-   patent grant shall immediately terminate with respect to any party
-   that institutes patent litigation against you (including a
-   cross-claim or counterclaim in a lawsuit) alleging that your
-   Contribution, or the work to which you have contributed,
-   constitutes direct or contributory patent infringement.
- .
- * 4. You represent that you are legally entitled to grant the above
-   license. If your employer(s) has rights to intellectual property
-   that you create that includes your Contributions, you represent
-   that you have received permission to make Contributions on behalf
-   of that employer, that your employer has waived such rights for
-   your Contributions to the Project, or that your employer has
-   executed a separate Corporate CLA with the Project.
- .
- * 5. You represent that each of your Contributions is your original
-   creation (see section 7 for submissions on behalf of others). You
-   represent that your Contribution submission(s) include complete
-   details of any third-party license or other restriction (including,
-   but not limited to, related copyright, patents and trademarks) of
-   which you are personally aware and which are associated with any
-   part of your Contribution.
- .
- * 6. You are not expected to provide support for your Contributions,
-   except to the extent you desire to provide support. You may provide
-   support for free, for a fee, or not at all. Your Contributions are
-   provided on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-   ANY KIND, either express or implied, including, without limitation,
-   any warranties or conditions of NON-INFRINGEMENT, MERCHANTABILITY,
-   or FITNESS FOR A PARTICULAR PURPOSE.
- .
- * 7. Should you wish to submit work that is not your original
-   creation, you may submit it to the Project separately from any
-   Contribution, identifying the complete details of its source and of
-   any license or other restriction (including, but not limited to,
-   related patents, trademarks, and license agreements) of which you
-   are personally aware, and conspicuously marking the work as
-   "Submitted on behalf of a third-party: [named here] ".
- .
- * 8. You agree to notify the Project of any facts or circumstances of
-   which you become aware that would make these representations
-   inaccurate in any respect.
- .
- * 9. The Project is under no obligations to accept and include every
-   contribution..
-
 License: EPL-1.0
  Eclipse Public License - v 1.0
  .

debian/eclipse-emf-examples.eh-install

-org.eclipse.emf.examples

debian/eclipse-emf-examples.lintian-overrides

-eclipse-emf-examples: codeless-jar usr/share/eclipse/dropins/emf-examples/eclipse/plugins/org.eclipse.emf.activities_*.jar
-eclipse-emf-examples: codeless-jar usr/share/eclipse/dropins/emf-examples/eclipse/plugins/org.eclipse.emf.examples_*.jar

debian/eclipse-emf-sdk.eh-install

-org.eclipse.emf.sdk

debian/eclipse-emf-sdk.lintian-overrides

-eclipse-emf-sdk: codeless-jar usr/share/eclipse/dropins/emf-sdk/eclipse/plugins/org.eclipse.emf.doc_*.jar
-eclipse-emf-sdk: codeless-jar usr/share/eclipse/dropins/emf-sdk/eclipse/plugins/org.eclipse.emf.example.installer_*.jar

debian/eclipse-emf.eh-install

-org.eclipse.emf

debian/eclipse-emf.lintian-overrides

-eclipse-emf: codeless-jar usr/share/eclipse/dropins/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore.editor_*.jar
-eclipse-emf: codeless-jar usr/share/eclipse/dropins/emf/eclipse/plugins/org.eclipse.emf.mapping.ecore_*.jar
-eclipse-emf: codeless-jar usr/share/eclipse/dropins/emf/eclipse/plugins/org.eclipse.emf_*.jar

debian/eclipse.environment

-doc
-examples
-features
-plugins
-

debian/eclipse.features

-org.eclipse.emf
-org.eclipse.emf.sdk
-org.eclipse.emf.examples

debian/gbp.conf

-[DEFAULT]
-compression=xz

debian/patches/Fedora-eclipse-emf-build-props.patch

-From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Date: Sat, 11 Aug 2012 21:49:38 +0200
-Subject: Fedora-eclipse-emf-build-props
-
----
- 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,\
--               examples/,\
-                readme.html
- jars.compile.order = .,\
-                      ant_tasks/importer.java.tasks.jar

debian/patches/Fedora-eclipse-emf-bundle-examples.patch

-From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Date: Sat, 11 Aug 2012 21:49:38 +0200
-Subject: Fedora-eclipse-emf-bundle-examples
-
----
- .../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 @@
- 	<!-- ===================================================================== -->
- 
- 	<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.emf/org.eclipse.emf/examples from ${exampleCVSTag} ..."/> 
--		<cvs failonerror="true" dest="${build.result.folder}/examples" cvsroot=":pserver:anonymous@dev.eclipse.org:/cvsroot/modeling">
--			<commandline>
--				<argument line="-Q export -r ${exampleCVSTag} org.eclipse.emf/org.eclipse.emf/examples" />
--			</commandline>
--		</cvs>
--
--		<move todir="${build.result.folder}/examples/" includeemptydirs="true">
--			<fileset dir="${build.result.folder}/examples/org.eclipse.emf/org.eclipse.emf/examples/">
-+		<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="**/javaCompiler...args" />
-+				<exclude name="**/build.xml" />
-+				<exclude name="**/build/**" />
- 			</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/">
-+				<exclude name="**/.cvsignore" />
-+				<exclude name="**/javaCompiler...args" />
-+				<exclude name="**/build.xml" />
-+				<exclude name="**/build/**" />
-+			</fileset>
-+		</copy>
-+		<copy todir="${build.result.folder}/examples/org.eclipse.emf.examples.library" includeemptydirs="true" failonerror="true">
-+			<fileset dir="${build.result.folder}/../org.eclipse.emf.examples.library/">
-+				<exclude name="**/.cvsignore" />
-+				<exclude name="**/javaCompiler...args" />
-+				<exclude name="**/build.xml" />
-+				<exclude name="**/build/**" />
-+			</fileset>
-+		</copy>
-+		<copy todir="${build.result.folder}/examples/org.eclipse.emf.examples.library.edit" includeemptydirs="true" failonerror="true">
-+			<fileset dir="${build.result.folder}/../org.eclipse.emf.examples.library.edit/">
-+				<exclude name="**/.cvsignore" />
-+				<exclude name="**/javaCompiler...args" />
-+				<exclude name="**/build.xml" />
-+				<exclude name="**/build/**" />
-+			</fileset>
-+		</copy>
-+		<copy todir="${build.result.folder}/examples/org.eclipse.emf.examples.library.editor" includeemptydirs="true" failonerror="true">
-+			<fileset dir="${build.result.folder}/../org.eclipse.emf.examples.library.editor/">
-+				<exclude name="**/.cvsignore" />
-+				<exclude name="**/javaCompiler...args" />
-+				<exclude name="**/build.xml" />
-+				<exclude name="**/build/**" />
-+			</fileset>
-+		</copy>
-+		<copy todir="${build.result.folder}/examples/org.eclipse.emf.exporter.html" includeemptydirs="true" failonerror="true">
-+			<fileset dir="${build.result.folder}/../org.eclipse.emf.exporter.html/">
-+				<exclude name="**/.cvsignore" />
-+				<exclude name="**/javaCompiler...args" />
-+				<exclude name="**/build.xml" />
-+				<exclude name="**/build/**" />
-+			</fileset>
-+		</copy>
-+		<copy todir="${build.result.folder}/examples/org.eclipse.emf.java" includeemptydirs="true" failonerror="true">
-+			<fileset dir="${build.result.folder}/../org.eclipse.emf.java/">
-+				<exclude name="**/.cvsignore" />
-+				<exclude name="**/javaCompiler...args" />
-+				<exclude name="**/build.xml" />
-+				<exclude name="**/build/**" />
-+			</fileset>
-+		</copy>
-+		<copy todir="${build.result.folder}/examples/org.eclipse.emf.java.edit" includeemptydirs="true" failonerror="true">
-+			<fileset dir="${build.result.folder}/../org.eclipse.emf.java.edit/">
-+				<exclude name="**/.cvsignore" />
-+				<exclude name="**/javaCompiler...args" />
-+				<exclude name="**/build.xml" />
-+				<exclude name="**/build/**" />
-+			</fileset>
-+		</copy>
-+		<copy todir="${build.result.folder}/examples/org.eclipse.emf.java.editor" includeemptydirs="true" failonerror="true">
-+			<fileset dir="${build.result.folder}/../org.eclipse.emf.java.editor/">
-+				<exclude name="**/.cvsignore" />
-+				<exclude name="**/javaCompiler...args" />
-+				<exclude name="**/build.xml" />
-+				<exclude name="**/build/**" />
-+			</fileset>
-+		</copy>
- 	</target>
- 	
- 	<!-- ===================================================================== -->

debian/patches/Fedora-eclipse-emf-make-homeless.patch

-From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Date: Sat, 11 Aug 2012 21:49:38 +0200
-Subject: Fedora-eclipse-emf-make-homeless
-
----
- 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
- 
--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
-+	

debian/patches/Fedora-eclipse-emf-platform-docs-location.patch

-From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Date: Sat, 11 Aug 2012 21:49:38 +0200
-Subject: Fedora-eclipse-emf-platform-docs-location
-
----
- 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/"/>
- 
- 	<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">

debian/patches/Fedora-eclipse-emf-symlinked-classpath.patch

-From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Date: Sat, 11 Aug 2012 21:49:38 +0200
-Subject: Fedora-eclipse-emf-symlinked-classpath
-
----
- 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 -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)