[SCM] eclipse-emf - Plug-in for eclipse - Debian package. branch, master, updated. 0c977fa8890d171c39aecc94542962721a8ae0a9

Niels Thykier nthykier-guest at alioth.debian.org
Sun May 30 20:31:16 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-emf - Plug-in for eclipse - Debian package.".

The branch, master has been updated
       via  0c977fa8890d171c39aecc94542962721a8ae0a9 (commit)
      from  9b2cd235adc0725f10fa2e33319748215e5e0cdd (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 0c977fa8890d171c39aecc94542962721a8ae0a9
Author: Niels Thykier <niels at thykier.net>
Date:   Sun May 30 22:31:05 2010 +0200

    Added missing ${misc:Depends} and descriptions for patches.

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

Summary of changes:
 debian/control                                     |   19 ++++++++++++-------
 debian/patches/eclipse-emf-build-props.patch       |    3 +++
 debian/patches/eclipse-emf-bundle-examples.patch   |    3 +++
 debian/patches/eclipse-emf-make-homeless.patch     |    3 +++
 .../eclipse-emf-platform-docs-location.patch       |    3 +++
 .../patches/eclipse-emf-symlinked-classpath.patch  |    3 +++
 debian/patches/unix2dos.patch                      |    3 +++
 7 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index be59cc4..e060630 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,8 @@ Homepage: http://www.eclipse.org/emf
 Package: eclipse-emf
 Architecture: all
 Depends: default-jre | java5-runtime | java6-runtime,
-         eclipse-platform (>= 3.5.0)
+         eclipse-platform (>= 3.5.0),
+         ${misc:Depends}
 Description: Eclipse Modeling Framework (EMF)
  The Eclipse Modeling Framework (EMF) allows developers to build tools and
  other applications based on a structured data model. From a model
@@ -34,7 +35,8 @@ Package: eclipse-emf-examples
 Architecture: all
 Depends: default-jre | java5-runtime | java6-runtime,
          eclipse-emf (= ${source:Version}),
-         eclipse-xsd (= ${source:Version})
+         eclipse-xsd (= ${source:Version}),
+         ${misc:Depends}
 Description: Eclipse EMF/XSD examples
  Installable versions of the example projects from the SDKs that demonstrate how
  to use the Eclipse Modeling Framework (EMF) and XML Schema Definition (XSD)
@@ -44,8 +46,9 @@ Package: eclipse-emf-sdk
 Architecture: all
 Depends: default-jre | java5-runtime | java6-runtime,
          eclipse-emf (= ${source:Version}),
-         eclipse-pde (>= 3.5.1)
-Description: Eclipse Modeling Framework (EMF)
+         eclipse-pde (>= 3.5.1),
+         ${misc:Depends}
+Description: Eclipse Modeling Framework (EMF) - (Source/Documentation)
  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
@@ -58,7 +61,8 @@ Description: Eclipse Modeling Framework (EMF)
 Package: eclipse-xsd
 Architecture: all
 Depends: default-jre | java5-runtime | java6-runtime,
-         eclipse-emf (= ${source:Version})
+         eclipse-emf (= ${source:Version}),
+         ${misc:Depends}
 Description: XML Schema Definition (XSD) for Eclipse
  The XML Schema Definition (XSD) plugin is a library that provides an API for
  manipulating the components of an XML Schema as described by the W3C XML
@@ -70,8 +74,9 @@ Architecture: all
 Depends: default-jre | java5-runtime | java6-runtime,
          eclipse-emf-sdk (= ${source:Version}),
          eclipse-pde (>= 3.5.2),
-         eclipse-xsd (= ${source:Version})
-Description: XML Schema Definition (XSD) for Eclipse
+         eclipse-xsd (= ${source:Version}),
+         ${misc:Depends}
+Description: XML Schema Definition (XSD) for Eclipse - (Source/Documentation)
  The XML Schema Definition (XSD) plugin is a library that provides an API for
  manipulating the components of an XML Schema as described by the W3C XML
  Schema specifications, as well as an API for manipulating the DOM-accessible
diff --git a/debian/patches/eclipse-emf-build-props.patch b/debian/patches/eclipse-emf-build-props.patch
index 7ea86ff..5189e3a 100644
--- a/debian/patches/eclipse-emf-build-props.patch
+++ b/debian/patches/eclipse-emf-build-props.patch
@@ -1,3 +1,6 @@
+Description: Exclude irrelevant files from source jars.
+Origin: Fedora
+
 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
diff --git a/debian/patches/eclipse-emf-bundle-examples.patch b/debian/patches/eclipse-emf-bundle-examples.patch
index 412b882..45b5ea2 100644
--- a/debian/patches/eclipse-emf-bundle-examples.patch
+++ b/debian/patches/eclipse-emf-bundle-examples.patch
@@ -1,3 +1,6 @@
+Description: Handle the examples being present rather than being fetched from CVS.
+Origin: Fedora
+
 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
diff --git a/debian/patches/eclipse-emf-make-homeless.patch b/debian/patches/eclipse-emf-make-homeless.patch
index d62badf..4115beb 100644
--- a/debian/patches/eclipse-emf-make-homeless.patch
+++ b/debian/patches/eclipse-emf-make-homeless.patch
@@ -1,3 +1,6 @@
+Description: Stop the javadoc generatings from setting ANT_HOME/JAVA_HOME
+Origin: Fedora
+
 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
diff --git a/debian/patches/eclipse-emf-platform-docs-location.patch b/debian/patches/eclipse-emf-platform-docs-location.patch
index 6e26229..f20f964 100644
--- a/debian/patches/eclipse-emf-platform-docs-location.patch
+++ b/debian/patches/eclipse-emf-platform-docs-location.patch
@@ -1,3 +1,6 @@
+Description: Correct path for eclipse javadoc.
+Origin: Fedora
+
 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
diff --git a/debian/patches/eclipse-emf-symlinked-classpath.patch b/debian/patches/eclipse-emf-symlinked-classpath.patch
index d50b354..742e145 100644
--- a/debian/patches/eclipse-emf-symlinked-classpath.patch
+++ b/debian/patches/eclipse-emf-symlinked-classpath.patch
@@ -1,3 +1,6 @@
+Description: Correct classpath for javadoc generation.
+Origin: Fedora
+
 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
diff --git a/debian/patches/unix2dos.patch b/debian/patches/unix2dos.patch
index 0ef51e9..89dfca1 100644
--- a/debian/patches/unix2dos.patch
+++ b/debian/patches/unix2dos.patch
@@ -1,3 +1,6 @@
+Description: Replace dos2unix with fromdos.
+Author: Niels Thykier <niels at thykier.net>
+
 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


hooks/post-receive
-- 
eclipse-emf - Plug-in for eclipse - Debian package.



More information about the pkg-java-commits mailing list