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

[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-emf - Plug-in for eclipse - Debian package.".

The branch, master has been updated
       via  64a140ad58375a399c08061cce9b13e010c1ce74 (commit)
       via  7f5182d9e8d76c051d2a97bd694b0aee62fc7cca (commit)
       via  dfec90d840f2ad163d41e2ae8b98ad6ea5ec85c9 (commit)
      from  f42e4b4de78d6fd3efd6084c119f406dd5e99a04 (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 64a140ad58375a399c08061cce9b13e010c1ce74
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Mar 31 15:44:20 2010 +0200

    Change the order of the targets in debian/rules.

commit 7f5182d9e8d76c051d2a97bd694b0aee62fc7cca
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Mar 31 15:38:12 2010 +0200

    Sort binary packages.

commit dfec90d840f2ad163d41e2ae8b98ad6ea5ec85c9
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Mar 31 15:36:31 2010 +0200

    Remove cdbs from Build-Depends.

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

Summary of changes:
 debian/control |   23 +++++++++++------------
 debian/rules   |   10 +++++-----
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index 2629873..55a1da7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Niels Thykier <niels at thykier.net>,
            Benjamin Drung <bdrung at ubuntu.com>
-Build-Depends: cdbs,
-               debhelper (>= 7),
+Build-Depends: debhelper (>= 7),
                default-jdk,
                eclipse-pde (>= 3.5.2),
                eclipse-platform (>= 3.5.2),
@@ -29,6 +28,16 @@ Description: Eclipse Modeling Framework (EMF)
  classes that enable viewing and command-based editing of the model, and a
  basic editor.
 
+Package: eclipse-emf-examples
+Architecture: all
+Depends: default-jre | java5-runtime | java6-runtime,
+         eclipse-emf (= ${source:Version}),
+         eclipse-xsd (= ${source:Version})
+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)
+ plugins.
+
 Package: eclipse-emf-sdk
 Architecture: all
 Depends: default-jre | java5-runtime | java6-runtime,
@@ -67,13 +76,3 @@ Description: XML Schema Definition (XSD) for Eclipse
  representation of XML Schema as a series of XML documents.
  .
  Documentation and source for the Eclipse XML Schema Definition (XSD) plugin.
-
-Package: eclipse-emf-examples
-Architecture: all
-Depends: default-jre | java5-runtime | java6-runtime,
-         eclipse-emf (= ${source:Version}),
-         eclipse-xsd (= ${source:Version})
-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)
- plugins.
diff --git a/debian/rules b/debian/rules
index 8e5fc8c..7ea7bd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,11 @@
 # Note: We use forceContextQualifier because the docs plugins use custom build
 #       scripts and don't work otherwise.
 BUILD_OPTIONS := -DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200906151043
-DROPINS:=usr/share/eclipse/dropins/
-export JAVA_HOME:=/usr/lib/jvm/default-java
+DROPINS := usr/share/eclipse/dropins/
+export JAVA_HOME := /usr/lib/jvm/default-java
+
+%:
+	dh --with eclipse-helper $@
 
 override_jh_compilefeatures:
 	jh_compilefeatures --build-opts '$(BUILD_OPTIONS)'
@@ -16,6 +19,3 @@ override_jh_installeclipse:
 	(cd debian/eclipse-emf-sdk/$(DROPINS)/emf-sdk/eclipse/plugins  && ls $(CURDIR)/debian/eclipse-emf/$(DROPINS)/emf/eclipse/plugins  | xargs rm -rf)
 	(cd debian/eclipse-xsd-sdk/$(DROPINS)/xsd-sdk/eclipse/features && ls $(CURDIR)/debian/eclipse-xsd/$(DROPINS)/xsd/eclipse/features | xargs rm -rf)
 	(cd debian/eclipse-xsd-sdk/$(DROPINS)/xsd-sdk/eclipse/plugins  && ls $(CURDIR)/debian/eclipse-xsd/$(DROPINS)/xsd/eclipse/plugins  | xargs rm -rf)
-
-%:
-	dh $@ --with eclipse-helper


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