[SCM] eclipse-emf - Plug-in for eclipse - Debian package. branch, master, updated. a151f777482f231ccb3403c7065558a7a1108475
Niels Thykier
nthykier-guest at alioth.debian.org
Sun Feb 21 15:35:53 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 a151f777482f231ccb3403c7065558a7a1108475 (commit)
from 922bf4a57b6b10100abcae3e2ae8c36b0fae67ff (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 a151f777482f231ccb3403c7065558a7a1108475
Author: Niels Thykier <niels at thykier.net>
Date: Sun Feb 21 16:35:38 2010 +0100
Updated dependencies and updated rules to use coming eclipse helpers.
-----------------------------------------------------------------------
Summary of changes:
debian/control | 25 +++++++++++--------------
debian/rules | 51 +++++++--------------------------------------------
2 files changed, 18 insertions(+), 58 deletions(-)
diff --git a/debian/control b/debian/control
index bd498fc..2629873 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,12 @@ 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: debhelper (>= 7),
+Build-Depends: cdbs,
+ debhelper (>= 7),
default-jdk,
- eclipse-pde (>= 3.5.1+repack),
- eclipse-platform (>= 3.5.1+repack),
+ eclipse-pde (>= 3.5.2),
+ eclipse-platform (>= 3.5.2),
+ javahelper (>= 0.30),
tofrodos
Standards-Version: 3.8.4
DM-Upload-Allowed: yes
@@ -17,8 +19,7 @@ Homepage: http://www.eclipse.org/emf
Package: eclipse-emf
Architecture: all
-Depends: default-jre | java1-runtime | java2-runtime |
- java5-runtime | java6-runtime,
+Depends: default-jre | java5-runtime | java6-runtime,
eclipse-platform (>= 3.5.0)
Description: Eclipse Modeling Framework (EMF)
The Eclipse Modeling Framework (EMF) allows developers to build tools and
@@ -30,8 +31,7 @@ Description: Eclipse Modeling Framework (EMF)
Package: eclipse-emf-sdk
Architecture: all
-Depends: default-jre | java1-runtime | java2-runtime |
- java5-runtime | java6-runtime,
+Depends: default-jre | java5-runtime | java6-runtime,
eclipse-emf (= ${source:Version}),
eclipse-pde (>= 3.5.1)
Description: Eclipse Modeling Framework (EMF)
@@ -46,8 +46,7 @@ Description: Eclipse Modeling Framework (EMF)
Package: eclipse-xsd
Architecture: all
-Depends: default-jre | java1-runtime | java2-runtime |
- java5-runtime | java6-runtime,
+Depends: default-jre | java5-runtime | java6-runtime,
eclipse-emf (= ${source:Version})
Description: XML Schema Definition (XSD) for Eclipse
The XML Schema Definition (XSD) plugin is a library that provides an API for
@@ -57,10 +56,9 @@ Description: XML Schema Definition (XSD) for Eclipse
Package: eclipse-xsd-sdk
Architecture: all
-Depends: default-jre | java1-runtime | java2-runtime |
- java5-runtime | java6-runtime,
+Depends: default-jre | java5-runtime | java6-runtime,
eclipse-emf-sdk (= ${source:Version}),
- eclipse-pde (>= 3.5.1),
+ eclipse-pde (>= 3.5.2),
eclipse-xsd (= ${source:Version})
Description: XML Schema Definition (XSD) for Eclipse
The XML Schema Definition (XSD) plugin is a library that provides an API for
@@ -72,8 +70,7 @@ Description: XML Schema Definition (XSD) for Eclipse
Package: eclipse-emf-examples
Architecture: all
-Depends: default-jre | java1-runtime | java2-runtime |
- java5-runtime | java6-runtime,
+Depends: default-jre | java5-runtime | java6-runtime,
eclipse-emf (= ${source:Version}),
eclipse-xsd (= ${source:Version})
Description: Eclipse EMF/XSD examples
diff --git a/debian/rules b/debian/rules
index 16b5d94..d99cb40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,15 @@
#!/usr/bin/make -f
-PDEBUILD ?= /usr/lib/eclipse/buildscripts/pdebuild
# Note: We use forceContextQualifier because the docs plugins use custom build
# scripts and don't work otherwise.
-PDEBUILD_OPTIONS:="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200906151043"
+ECLIPSE_PDEBUILD_OPTIONS := -DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v200906151043
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/eclipse.mk
-BUILD_DIR:= debian/.eclipse-build
DROPINS:=usr/share/eclipse/dropins/
-TOBUILD=org.eclipse.emf \
+ECLIPSE_BUILD_LIST=org.eclipse.emf \
org.eclipse.emf.sdk \
org.eclipse.xsd \
org.eclipse.xsd.edit \
@@ -19,47 +20,9 @@ TOBUILD=org.eclipse.emf \
org.eclipse.xsd.sdk \
org.eclipse.emf.examples
-build: build-stamp
-
-build-stamp:
- dh_testdir
- mkdir -p $(BUILD_DIR)
- cp -a org.eclipse.* $(BUILD_DIR)
- for FILE in $(TOBUILD) ; do \
- cd $(BUILD_DIR) ;\
- $(PDEBUILD) -f $$FILE -a $(PDEBUILD_OPTIONS) ;\
- cd $(CURDIR) ;\
- done
- touch $@
-
-binary binary-arch binary-indep:
- dh $@
-
-override_dh_install:
- dh_install
- for P in `dh_listpackages` ; do \
- mkdir -p debian/$$P/usr/share/eclipse/dropins/ ; \
- done
- unzip -q -n -d debian/eclipse-emf/$(DROPINS)/emf $(BUILD_DIR)/build/rpmBuild/org.eclipse.emf.zip
- unzip -q -n -d debian/eclipse-emf-sdk/$(DROPINS)/emf-sdk $(BUILD_DIR)/build/rpmBuild/org.eclipse.emf.sdk.zip
- unzip -q -n -d debian/eclipse-xsd/$(DROPINS)/xsd $(BUILD_DIR)/build/rpmBuild/org.eclipse.xsd.zip
- unzip -q -n -d debian/eclipse-xsd/$(DROPINS)/xsd $(BUILD_DIR)/build/rpmBuild/org.eclipse.xsd.edit.zip
- unzip -q -n -d debian/eclipse-xsd/$(DROPINS)/xsd $(BUILD_DIR)/build/rpmBuild/org.eclipse.xsd.editor.zip
- unzip -q -n -d debian/eclipse-xsd/$(DROPINS)/xsd $(BUILD_DIR)/build/rpmBuild/org.eclipse.xsd.mapping.zip
- unzip -q -n -d debian/eclipse-xsd/$(DROPINS)/xsd $(BUILD_DIR)/build/rpmBuild/org.eclipse.xsd.mapping.editor.zip
- unzip -q -n -d debian/eclipse-xsd/$(DROPINS)/xsd $(BUILD_DIR)/build/rpmBuild/org.eclipse.xsd.ecore.converter.zip
- unzip -q -n -d debian/eclipse-xsd-sdk/$(DROPINS)/xsd-sdk $(BUILD_DIR)/build/rpmBuild/org.eclipse.xsd.sdk.zip
- unzip -q -n -d debian/eclipse-emf-examples/$(DROPINS)/emf-examples $(BUILD_DIR)/build/rpmBuild/org.eclipse.emf.examples.zip
-
+common-binary-post-install-indep::
+ # Avoid duplications (sdk depend on the non-sdk packages)
(cd debian/eclipse-emf-sdk/$(DROPINS)/emf-sdk/eclipse/features && ls $(CURDIR)/debian/eclipse-emf/$(DROPINS)/emf/eclipse/features | xargs rm -rf)
(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)
-
-clean:
- dh_testdir
- dh_testroot
- rm -fr debian/.eclipse-build/
- dh_clean
-
-.PHONEY: clean
hooks/post-receive
--
eclipse-emf - Plug-in for eclipse - Debian package.
More information about the pkg-java-commits
mailing list