Author: vladimir-guest
Date: 2007-06-05 21:08:48 +0000 (Tue, 05 Jun 2007)
New Revision: 3597
Added:
trunk/eclipse-gef/debian/eclipse-gef-examples.install
trunk/eclipse-gef/debian/eclipse-gef-sdk.install
trunk/eclipse-gef/debian/eclipse-gef.docs
trunk/eclipse-gef/debian/eclipse-gef.install
trunk/eclipse-gef/debian/patches/eclipse-gef-dont-set-bootclasspath.patch
Removed:
trunk/eclipse-gef/debian/.cvsignore
trunk/eclipse-gef/debian/eclipse-pdebuild.mk
trunk/eclipse-gef/debian/patches/eclipse-gef-bidi.patch
trunk/eclipse-gef/debian/patches/eclipse-gef-introspector.patch
Modified:
trunk/eclipse-gef/debian/changelog
trunk/eclipse-gef/debian/control
trunk/eclipse-gef/debian/rules
Log:
New version of eclipse-gef-3.2.1
Deleted: trunk/eclipse-gef/debian/.cvsignore
===================================================================
--- trunk/eclipse-gef/debian/.cvsignore 2007-06-05 21:04:50 UTC (rev 3596)
+++ trunk/eclipse-gef/debian/.cvsignore 2007-06-05 21:08:48 UTC (rev 3597)
@@ -1,16 +0,0 @@
-*.substvars
-eclipse-gef
-eclipse-ecj
-eclipse-efj
-eclipse-jdt
-eclipse-jdt-common
-eclipse-pde
-eclipse-pde-common
-eclipse-platform
-eclipse-platform-common
-eclipse-rcp
-eclipse-rcp-common
-eclipse-sdk
-eclipse-source
-files
-tmp
Modified: trunk/eclipse-gef/debian/changelog
===================================================================
--- trunk/eclipse-gef/debian/changelog 2007-06-05 21:04:50 UTC (rev 3596)
+++ trunk/eclipse-gef/debian/changelog 2007-06-05 21:08:48 UTC (rev 3597)
@@ -1,3 +1,11 @@
+eclipse-gef (3.2.1-1) feisty; urgency=low
+
+ * Updated to new upstream 3.2.1
+ * Recreated rules to be similar to Fedora
+ * Splitted to several packages
+
+ -- Vladimír Lapáček <[EMAIL PROTECTED]> Fri, 13 Apr 2007 22:16:54 +0200
+
eclipse-gef (3.1.1-1) unstable; urgency=low
[ Stephan Michels ]
Modified: trunk/eclipse-gef/debian/control
===================================================================
--- trunk/eclipse-gef/debian/control 2007-06-05 21:04:50 UTC (rev 3596)
+++ trunk/eclipse-gef/debian/control 2007-06-05 21:08:48 UTC (rev 3597)
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
Uploaders: Stephan Michels <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.2), eclipse (>= 3.1.1-5), cdbs
+Build-Depends: debhelper (>> 4.2), eclipse (>= 3.2.2), ant, unzip, zip,
java-gcj-compat-dev
Build-Conflicts: eclipse-gef
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
Package: eclipse-gef
-Architecture: any
+Architecture: all
Depends: eclipse
Description: The Graphical Editing Framework for Eclipse
The Graphical Editing Framework (GEF) allows developers to create a rich
@@ -23,3 +23,41 @@
almost any application, including but not limited to: activity diagrams,
GUI builders, class diagram editors, state machines, and even WYSIWYG text
editors.
+
+Package: eclipse-gef-sdk
+Architecture: all
+Depends: eclipse-gef (>= 3.2.1)
+Description: The Graphical Editing Framework for Eclipse
+ The Graphical Editing Framework (GEF) allows developers to create a rich
+ graphical editor from an existing application model. GEF consists of 2
+ plug-ins. The org.eclipse.draw2d plug-in provides a layout and rendering
+ toolkit for displaying graphics. The developer can then take advantage of
+ the many common operations provided in GEF and/or extend them for the
+ specific domain. GEF employs an MVC (model-view-controller) architecture
+ which enables simple changes to be applied to the model from the view.
+ .
+ GEF is completely application neutral and provides the groundwork to build
+ almost any application, including but not limited to: activity diagrams,
+ GUI builders, class diagram editors, state machines, and even WYSIWYG text
+ editors.
+ .
+ Source and documentation for Eclipse GEF for use within Eclipse.
+
+Package: eclipse-gef-examples
+Architecture: all
+Depends: eclipse-gef (>= 3.2.1)
+Description: The Graphical Editing Framework for Eclipse
+ The Graphical Editing Framework (GEF) allows developers to create a rich
+ graphical editor from an existing application model. GEF consists of 2
+ plug-ins. The org.eclipse.draw2d plug-in provides a layout and rendering
+ toolkit for displaying graphics. The developer can then take advantage of
+ the many common operations provided in GEF and/or extend them for the
+ specific domain. GEF employs an MVC (model-view-controller) architecture
+ which enables simple changes to be applied to the model from the view.
+ .
+ GEF is completely application neutral and provides the groundwork to build
+ almost any application, including but not limited to: activity diagrams,
+ GUI builders, class diagram editors, state machines, and even WYSIWYG text
+ editors.
+ .
+ Example source code that demonstrates how to use Eclipse GEF.
Added: trunk/eclipse-gef/debian/eclipse-gef-examples.install
===================================================================
--- trunk/eclipse-gef/debian/eclipse-gef-examples.install
(rev 0)
+++ trunk/eclipse-gef/debian/eclipse-gef-examples.install 2007-06-05
21:08:48 UTC (rev 3597)
@@ -0,0 +1,6 @@
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/features/org.eclipse.gef.examples_*
usr/lib/eclipse/features
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/plugins/org.eclipse.gef.examples.source_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/plugins/org.eclipse.gef.examples.text_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/plugins/org.eclipse.gef.examples.logic_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/plugins/org.eclipse.gef.examples.flow_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/plugins/org.eclipse.gef.examples.shapes_*
usr/lib/eclipse/plugins
Added: trunk/eclipse-gef/debian/eclipse-gef-sdk.install
===================================================================
--- trunk/eclipse-gef/debian/eclipse-gef-sdk.install
(rev 0)
+++ trunk/eclipse-gef/debian/eclipse-gef-sdk.install 2007-06-05 21:08:48 UTC
(rev 3597)
@@ -0,0 +1,5 @@
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/features/org.eclipse.gef.sdk_*
usr/lib/eclipse/features
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/features/org.eclipse.gef.source_*
usr/lib/eclipse/features
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/plugins/org.eclipse.draw2d.doc.isv_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/plugins/org.eclipse.gef.doc.isv_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/plugins/org.eclipse.gef.source_*
usr/lib/eclipse/plugins
Added: trunk/eclipse-gef/debian/eclipse-gef.docs
===================================================================
--- trunk/eclipse-gef/debian/eclipse-gef.docs (rev 0)
+++ trunk/eclipse-gef/debian/eclipse-gef.docs 2007-06-05 21:08:48 UTC (rev
3597)
@@ -0,0 +1 @@
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/readme/readme_gef.html
Added: trunk/eclipse-gef/debian/eclipse-gef.install
===================================================================
--- trunk/eclipse-gef/debian/eclipse-gef.install
(rev 0)
+++ trunk/eclipse-gef/debian/eclipse-gef.install 2007-06-05 21:08:48 UTC
(rev 3597)
@@ -0,0 +1,3 @@
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/features/org.eclipse.gef_*
usr/lib/eclipse/features
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/plugins/org.eclipse.draw2d_*
usr/lib/eclipse/plugins
+source-tree/org.eclipse.releng.gefbuilder/temp/eclipse/plugins/org.eclipse.gef_*
usr/lib/eclipse/plugins
Deleted: trunk/eclipse-gef/debian/eclipse-pdebuild.mk
===================================================================
--- trunk/eclipse-gef/debian/eclipse-pdebuild.mk 2007-06-05 21:04:50 UTC
(rev 3596)
+++ trunk/eclipse-gef/debian/eclipse-pdebuild.mk 2007-06-05 21:08:48 UTC
(rev 3597)
@@ -1,313 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2005 Ivan Dubrov <[EMAIL PROTECTED]>
-# Description: Builds and cleans packages which use an Eclipse PDE Build
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-#
-# The file is modified by Stephan Michels<[EMAIL PROTECTED]>
-
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_eclipse_pde
-_cdbs_class_eclipse_pde := 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_cdbs_rules_path)/debhelper.mk$(_cdbs_makefile_suffix)
-
-# Version of the upstream package
-DEB_UPSTREAM_VERSION=$(shell echo $(DEB_NOEPOCH_VERSION) | grep -o '^[^\-]*')
-
-
-# The home directory of the Java Runtime Environment (JRE) or Java Development
-# Kit (JDK). You can either directly set JAVA_HOME in debian/rules or set
-# JAVA_HOME_DIRS to multiple possible home directories. The first existing
-# directory from this list is used for JAVA_HOME. You can also override
-# JAVACMD in case you don't want to use the default JAVA_HOME/bin/java.
-JAVA_HOME = $(shell for jh in $(JAVA_HOME_DIRS); do if [ -d "$$jh" ]; then \
- echo $${jh}; exit 0; fi; done)
-JAVACMD = $(JAVA_HOME)/bin/java
-
-
-# Directory that contains additional plugins to be used during the build
-PDEBUILD_BASELOCATION ?= /usr/share/eclipse
-
-# Component of the package, which should be builded (required)
-PDEBUILD_COMPONENT ?=
-
-# PDE Build release engineering directory, with build.properties and
-# customTargets.xml
-PDEBUILD_BUILDER ?= $(PDEBUILD_COMPONENT)
-
-# Determine the most recent PDE Build scripts plugin version
-ifndef PDE_VERSION
-PDEBUILD_VERSION := $(shell ls $(PDEBUILD_BASELOCATION)/plugins/ | \
- grep
"^org\.eclipse\.pde\.build_[[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*$$" | \
- sed "s%org\.eclipse\.pde\.build_\(.*\)%\1%" | \
- sort -t. -k1,1 -k2,2 -k3,3 -n -r | head -n 1)
-endif
-
-# PDE Build scrips
-PDEBUILD_SCRIPTS ?=
$(PDEBUILD_BASELOCATION)/plugins/org.eclipse.pde.build_$(PDEBUILD_VERSION)/scripts
-
-# PDE Build Ant script
-PDEBUILD_BUILDFILE ?= $(PDEBUILD_SCRIPTS)/build.xml
-
-# Eclipse temporary configuration store
-PDEBUILD_CONFIG ?= debian/tmp/configure
-
-# Eclipse temporary workspace
-PDEBUILD_DATA ?= debian/tmp/workspace
-
-# Directory where plugins are built. Should contain two subdirectories,
-# plugins and features. Each of these contains plugins and features that
-# are built.
-PDEBUILD_BUILDDIR ?= src
-
-#
-PDEBUILD_OPTS ?=
-
-#
-PDEBUILD_VMARGS ?=
-
-
-# Current plaform, which should be used to build the plugins
-ifeq ($(DEB_HOST_ARCH),i386)
- PDEBUILD_PLATFORM ?= x86
-endif
-ifeq ($(DEB_HOST_ARCH),ia64)
- PDEBUILD_PLATFORM ?= ia64
-endif
-ifeq ($(DEB_HOST_ARCH),amd64)
- PDEBUILD_PLATFORM ?= x86_64
-endif
-ifeq ($(DEB_HOST_ARCH),powerpc)
- PDEBUILD_PLATFORM ?= ppc
-endif
-ifeq ($(DEB_HOST_ARCH),s390)
- PDEBUILD_PLATFORM ?= s390
-endif
-
-
-# Protocol for the cvs repository of the releng package
-PDEBUILD_BUILDERPROTOCOL ?= pserver
-
-# Username for the cvs repository of the releng package
-PDEBUILD_BUILDERUSER ?= anonymous
-
-# Host of the cvs repository of the releng package
-PDEBUILD_BUILDERHOST ?= dev.eclipse.org
-
-# Repository path for the cvs repository of the releng package
-PDEBUILD_BUILDERREP ?= /cvsroot/tools
-
-# CVS root for the cvs repository of the releng package
-PDEBUILD_BUILDERROOT ?=
:$(PDEBUILD_BUILDERPROTOCOL):$(PDEBUILD_BUILDERUSER)@$(PDEBUILD_BUILDERHOST):$(PDEBUILD_BUILDERREP)
-
-# CVS tag of the releng package
-PDEBUILD_BUILDERTAG ?= HEAD
-
-# Module name of the releng package (required)
-PDEBUILD_BUILDERPACKAGE ?=
-
-# Patch for the builder package
-PDEBUILD_BUILDERPATCH ?=
-
-
-# Protocol for the cvs repository of the maps package
-PDEBUILD_MAPSPROTOCOL ?= $(PDEBUILD_BUILDERPROTOCOL)
-
-# Username for the cvs repository of the maps package
-PDEBUILD_MAPSUSER ?= $(PDEBUILD_BUILDERUSER)
-
-# Host of the cvs repository of the maps package
-PDEBUILD_MAPSHOST ?= $(PDEBUILD_BUILDERHOST)
-
-# Repository path for the cvs repository of the maps package
-PDEBUILD_MAPSREP ?= $(PDEBUILD_BUILDERREP)
-
-# CVS root for the cvs repository of the maps package
-PDEBUILD_MAPSROOT ?=
:$(PDEBUILD_MAPSPROTOCOL):$(PDEBUILD_MAPSUSER)@$(PDEBUILD_MAPSHOST):$(PDEBUILD_MAPSREP)
-
-# CVS tag of the releng package
-PDEBUILD_MAPSTAG ?= $(PDEBUILD_BUILDERTAG)
-
-# Module name of the maps package
-PDEBUILD_MAPSPACKAGE ?= $(PDEBUILD_BUILDERPACKAGE)
-
-
-# Build type of the release
-PDEBUILD_BUILDTYPE=R
-
-# Build identifier of the relase
-PDEBUILD_BUILDID=$(DEB_UPSTREAM_VERSION)
-
-# Build label of the release
-PDEBUILD_BUILDLABEL=$(PDEBUILD_BUILDTYPE).$(PDEBUILD_BUILDID)
-
-# Ant build script, which is used to build the plugins
-# Normally it is enough to use the standard build script, which comes
-# with the org.eclipse.pde.build plugin
-PDEBUILD_BUILDFILE ?= $(PDEBUILD_SCRIPTS)/build.xml
-
-# Property file for Ant, defaults to debian/ant.properties if it exists.
-# You may define additional properties that are referenced from build.xml so
-# you don't have to modify upstream's build.xml. Please note that command-line
-# arguments in ANT_ARGS (see below) override the settings in build.xml and
-# the property file.
-PDEBUILD_PROPERTYFILE = $(shell test -f $(CURDIR)/debian/ant.properties &&
echo $(CURDIR)/debian/ant.properties)
-
-PDEBUILD_ANT_COMPILER ?= org.eclipse.jdt.core.JDTCompilerAdapter
-
-# You can specify additional JVM arguments in ANT_OPTS and Ant command-line
-# arguments in ANT_ARGS, like for the Ant wrapper script and sepcified in
-# Ant's documentation ("Running Ant"). You can additionally define
-# ANT_ARGS_<package> for each individual package, e.g. to override the default
-# settings for compile.optimize.
-PDEBUILD_ECLIPSE_INVOKE = cd $(DEB_BUILDDIR) && \
- $(JAVACMD) $(PDEBUILD_VMARGS) \
-
-Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.0/classmap.db \
- -jar $(PDEBUILD_BASELOCATION)/startup.jar \
- -launcher $(PDEBUILD_BASELOCATION)/eclipse \
- -install $(PDEBUILD_BASELOCATION) \
- -consoleLog \
- -data $(CURDIR)/$(PDEBUILD_DATA) \
- -configuration $(CURDIR)/$(PDEBUILD_CONFIG) \
- -application org.eclipse.ant.core.antRunner \
- -buildfile $(PDEBUILD_BUILDFILE) \
- -Dpde.build.scripts=$(PDEBUILD_SCRIPTS) \
- -Dcomponent=$(PDEBUILD_COMPONENT) \
- -Dbuilder=$(CURDIR)/$(PDEBUILD_BUILDER) \
- -DbuildDirectory=$(CURDIR)/$(PDEBUILD_BUILDDIR) \
- -DbaseLocation=$(PDEBUILD_BASELOCATION) \
- -DmapCvsRoot=$(PDEBUILD_MAPSROOT) \
- -DmapVersionTag=$(PDEBUILD_MAPSTAG) \
- -DbuildType=$(PDEBUILD_BUILDTYPE) \
- -DbuildId=$(PDEBUILD_BUILDID) \
- -DbuildLabel=$(PDEBUILD_BUILDLABEL) \
- -Dbuild.compiler=$(PDEBUILD_ANT_COMPILER) \
- -Djavacfailonerror=true \
- -DbuildingOSGi=true \
- $(if $(PDEBUILD_PROPERTYFILE),-propertyfile
$(PDEBUILD_PROPERTYFILE),) \
- $(PDEBUILD_OPTS)
-
-# Targets to invoke for building, installing, testing and cleaning up.
-# Building uses the default target from build.xml, installing and testing is
-# only called if the corresponding variable is set. You can also specify
-# multiple targets for each step.
-PDEBUILD_FETCH_TARGET = preBuild fetch generate
-PDEBUILD_BUILD_TARGET = process assemble package postBuild
-PDEBUILD_CLEAN_TARGET = clean
-
-
-
-# Check JAVA_HOME and Eclipe SDK
-
-DEB_PHONY_RULES += eclipse-sanity-check
-eclipse-sanity-check:
- @if ! test -r "$(JAVA_HOME)"; then \
- echo "You must specify a valid JAVA_HOME or JAVACMD!"; \
- exit 1; \
- fi
- @if ! test -r
"$(PDEBUILD_BASELOCATION)/plugins/org.eclipse.pde.build_$(PDEBUILD_VERSION)";
then \
- echo "You must specify a valid Eclipse SDK directory!"; \
- exit 1; \
- fi
-
-
-# Rule to fetch feature and plugins
-
-get-orig-source-clean::
- # clean source directories
- ls -I debian | rm -rf `xargs`
-
-get-orig-source-fetch:: eclipse-sanity-check get-orig-source-clean
- # checkout the builder package
- cvs -d $(PDEBUILD_BUILDERROOT) export -r $(PDEBUILD_BUILDERTAG)
$(PDEBUILD_BUILDERPACKAGE)
- ls -la
- mv $(CURDIR)/$(PDEBUILD_BUILDERPACKAGE)/* $(CURDIR)
- rm -r $(CURDIR)/$(PDEBUILD_BUILDERPACKAGE)
-
- # Patch the builder package
- @if test -n "$(PDEBUILD_BUILDERPATCH)"; then \
- echo Patching builder with $(PDEBUILD_BUILDERPATCH); \
- patch -p0 -u <$(CURDIR)/$(PDEBUILD_BUILDERPATCH); \
- else \
- echo "PDEBUILD_BUILDERPATCH unset, skipping"; \
- fi
-
- # fetch plugins and features
- $(PDEBUILD_ECLIPSE_INVOKE) $(PDEBUILD_FETCH_TARGET)
- rm -r $(CURDIR)/debian/tmp
-
-get-orig-source:: get-orig-source-fetch
- dh_testdir
-
- # create orig tarball
- cd .. && \
- tar cfz $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
- --exclude=CVS --exclude=.svn --exclude=debian \
- $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
-
-
-# Invoke PDE Build
-
-common-build-arch common-build-indep:: debian/stamp-pde-build
eclipse-sanity-check
-
-debian/stamp-pde-build:
- dh_testdir
-
- # build features and plugins
- $(PDEBUILD_ECLIPSE_INVOKE) -DskipFetch=true $(PDEBUILD_BUILD_TARGET)
- rm -r $(CURDIR)/debian/tmp
-
- touch $@
-
-
-#common-install-arch common-install-indep:: debian/stamp-pde-install
-#
-#debian/stamp-pde-install: debian/stamp-pde-build
-# dh_testdir
-# dh_testroot
-#
-# # Install the zip file into our destination directory.
-# mkdir -p $(CURDIR)/debian/tmp
-# install -d debian/tmp/$(PDEBUILD_BASELOCATION)
-# unzip $(CURDIR)/$(PDEBUILD_BUILDDIR)/R*/*.zip -d
debian/tmp/$(PDEBUILD_BASELOCATION)/..
-#
-# #dh_installdirs
-# #dh_install
-#
-# #rm -r $(CURDIR)/debian/tmp
-#
-# touch $@
-
-
-clean:: eclipse-sanity-check
- dh_testdir
-
- # invoke the clean target
- $(PDEBUILD_ECLIPSE_INVOKE) -DskipFetch=true $(PDEBUILD_CLEAN_TARGET)
- rm -r $(CURDIR)/debian/tmp
-
- rm -f debian/stamp-pde-build
-
-endif
-
Deleted: trunk/eclipse-gef/debian/patches/eclipse-gef-bidi.patch
===================================================================
--- trunk/eclipse-gef/debian/patches/eclipse-gef-bidi.patch 2007-06-05
21:04:50 UTC (rev 3596)
+++ trunk/eclipse-gef/debian/patches/eclipse-gef-bidi.patch 2007-06-05
21:08:48 UTC (rev 3597)
@@ -1,23 +0,0 @@
----
src/plugins/org.eclipse.draw2d/src/org/eclipse/draw2d/text/BidiProcessor.java
2005-12-12 16:01:14.000000000 +0100
-+++
src/plugins/org.eclipse.draw2d/src/org/eclipse/draw2d/text/BidiProcessor.java
2005-12-12 16:19:02.000000000 +0100
-@@ -10,7 +10,7 @@
-
*******************************************************************************/
- package org.eclipse.draw2d.text;
-
--import java.text.Bidi;
-+//import java.text.Bidi;
- import java.util.ArrayList;
- import java.util.List;
-
-@@ -186,9 +186,9 @@
- char[] chars = new char[bidiText.length()];
- bidiText.getChars(0, bidiText.length(), chars, 0);
-
-- if (orientation != SWT.RIGHT_TO_LEFT
-+ /* if (orientation != SWT.RIGHT_TO_LEFT
- && !Bidi.requiresBidi(chars, 0, chars.length -
1))
-- return;
-+ return;*/
-
- int[] levels = new int[15];
- TextLayout layout = FlowUtilities.getTextLayout();
Added: trunk/eclipse-gef/debian/patches/eclipse-gef-dont-set-bootclasspath.patch
===================================================================
--- trunk/eclipse-gef/debian/patches/eclipse-gef-dont-set-bootclasspath.patch
(rev 0)
+++ trunk/eclipse-gef/debian/patches/eclipse-gef-dont-set-bootclasspath.patch
2007-06-05 21:08:48 UTC (rev 3597)
@@ -0,0 +1,76 @@
+Index: build.xml
+===================================================================
+RCS file: /home/tools/org.eclipse.releng.gefbuilder/build.xml,v
+retrieving revision 1.6
+diff -u -r1.6 build.xml
+--- build.xml 10 Nov 2005 01:34:01 -0000 1.6
++++ build.xml 3 Apr 2006 17:15:02 -0000
+@@ -7,8 +7,6 @@
+ <touch file="${user.home}/.cvspass" />
+ <property name="timestamp" value="${DSTAMP}${TSTAMP}" />
+ <property name="buildDirectory" value="${basedir}/src/eclipse"
/>
+- <property name="bootclasspath" value="${java.home}/lib/rt.jar"
/>
+- <property name="rt" value="${java.home}/lib/rt.jar" />
+
+ <property name="buildType" value="I" />
+ <property name="buildId" value="build" />
+Index: examples/build.properties
+===================================================================
+RCS file: /home/tools/org.eclipse.releng.gefbuilder/examples/build.properties,v
+retrieving revision 1.6
+diff -u -r1.6 build.properties
+--- examples/build.properties 11 Apr 2005 21:32:10 -0000 1.6
++++ examples/build.properties 3 Apr 2006 17:15:02 -0000
+@@ -23,7 +23,6 @@
+ baseos=win32
+ basews=win32
+ basearch=x86
+-bootclasspath=${java.home}/lib/rt.jar
+ javacfailonerror=false
+ javacVerbose=true
+ javacDebugInfo=on
+Index: runtime/build.properties
+===================================================================
+RCS file: /home/tools/org.eclipse.releng.gefbuilder/runtime/build.properties,v
+retrieving revision 1.6
+diff -u -r1.6 build.properties
+--- runtime/build.properties 11 Apr 2005 21:32:10 -0000 1.6
++++ runtime/build.properties 3 Apr 2006 17:15:02 -0000
+@@ -23,7 +23,6 @@
+ baseos=win32
+ basews=win32
+ basearch=x86
+-bootclasspath=${java.home}/lib/rt.jar
+ javacfailonerror=false
+ javacVerbose=true
+ javacDebugInfo=on
+Index: sdk/build.properties
+===================================================================
+RCS file: /home/tools/org.eclipse.releng.gefbuilder/sdk/build.properties,v
+retrieving revision 1.6
+diff -u -r1.6 build.properties
+--- sdk/build.properties 3 Feb 2006 18:37:16 -0000 1.6
++++ sdk/build.properties 3 Apr 2006 17:15:02 -0000
+@@ -23,7 +23,6 @@
+ baseos=win32
+ basews=win32
+ basearch=x86
+-bootclasspath=${java.home}/lib/rt.jar
+ javacfailonerror=false
+ javacVerbose=true
+ javacDebugInfo=on
+Index: tests/build.properties
+===================================================================
+RCS file: /home/tools/org.eclipse.releng.gefbuilder/tests/build.properties,v
+retrieving revision 1.5
+diff -u -r1.5 build.properties
+--- tests/build.properties 11 Apr 2005 20:59:08 -0000 1.5
++++ tests/build.properties 3 Apr 2006 17:15:02 -0000
+@@ -23,7 +23,6 @@
+ baseos=win32
+ basews=win32
+ basearch=x86
+-bootclasspath=${java.home}/lib/rt.jar
+ javacfailonerror=false
+ javacVerbose=true
+ javacDebugInfo=on
Deleted: trunk/eclipse-gef/debian/patches/eclipse-gef-introspector.patch
===================================================================
--- trunk/eclipse-gef/debian/patches/eclipse-gef-introspector.patch
2007-06-05 21:04:50 UTC (rev 3596)
+++ trunk/eclipse-gef/debian/patches/eclipse-gef-introspector.patch
2007-06-05 21:08:48 UTC (rev 3597)
@@ -1,11 +0,0 @@
---- src/plugins/org.eclipse.gef/src/org/eclipse/gef/tools/AbstractTool.java
2005-12-12 16:44:12.000000000 +0100
-+++ src/plugins/org.eclipse.gef/src/org/eclipse/gef/tools/AbstractTool.java
2005-12-12 16:44:29.000000000 +0100
-@@ -289,7 +289,7 @@
-
- try {
- PropertyDescriptor[] descriptors = Introspector
-- .getBeanInfo(getClass(),
Introspector.IGNORE_ALL_BEANINFO)
-+ .getBeanInfo(getClass())
- .getPropertyDescriptors();
- PropertyDescriptor property = null;
- for (int i = 0; i < descriptors.length; i++) {
Modified: trunk/eclipse-gef/debian/rules
===================================================================
--- trunk/eclipse-gef/debian/rules 2007-06-05 21:04:50 UTC (rev 3596)
+++ trunk/eclipse-gef/debian/rules 2007-06-05 21:08:48 UTC (rev 3597)
@@ -1,44 +1,121 @@
#!/usr/bin/make -f
-# debian/rules file using cdbs
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include debian/eclipse-pdebuild.mk
-#JAVA_HOME := /usr/lib/jvm/java-gcj
-#JAVA_HOME := /usr/lib/kaffe
-JAVA_HOME := /usr/lib/jvm/cacao
-JAVACMD := JAVA_HOME=$(JAVA_HOME) /usr/bin/cacao -Xmx256m
-ANT_HOME := /usr/share/ant
-DEB_ANT_ARGS := -Dcompiler=javac1.5
+export JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA := /usr/lib/jvm/java-gcj/bin/java
+ECLIPSE_ROOT := /usr/lib/eclipse
+ECLIPSE := $(ECLIPSE_ROOT)/eclipse
+PDEBUILD_ROOT :=
$(ECLIPSE_ROOT)/plugins/org.eclipse.pde.build_3.2.1.r321_v20060823
+SOURCE_TREE := $(CURDIR)/source-tree
+BUILD_DIR := $(SOURCE_TREE)/org.eclipse.releng.gefbuilder
+SOURCE=$(shell ls upstream/eclipse-gef*.tar.bz2)
+VERSION := 3.2.1
-PDEBUILD_BUILDERHOST=dev.eclipse.org
-PDEBUILD_BUILDERREP=/cvsroot/tools
-PDEBUILD_BUILDERTAG=R31_Maintenance
-PDEBUILD_BUILDERPACKAGE=org.eclipse.releng.gefbuilder
-PDEBUILD_COMPONENT=sdk
-#PDEBUILD_BUILDDIR=$(CURDIR)/$(SOURCE_TREE)/$(PDEBUILD_PACKAGE)/src/eclipse
-PDEBUILD_OPTS=-DbaseExists=true
+uncompress: uncompress-stamp
+uncompress-stamp:
+ dh_testdir
-PDEBUILD_MAPSTAG=R31_Maintenance
-PDEBUILD_MAPSPACKAGE=org.eclipse.gef.releng
+ mkdir -p "$(SOURCE_TREE)"
+ (cd "$(SOURCE_TREE)" && tar xfj ../"$(SOURCE)" > /dev/null)
-install/eclipse-gef::
- # Install the zip file into our destination directory.
- mkdir -p debian/tmp
- install -d debian/tmp/$(PDEBUILD_BASELOCATION)
- unzip $(CURDIR)/$(PDEBUILD_BUILDDIR)/R*/*.zip -d
debian/tmp/$(PDEBUILD_BASELOCATION)/..
+ touch uncompress-stamp
- dh_installdirs -p$(cdbs_curpkg) usr/share/eclipse/features
usr/share/eclipse/plugins
- dh_install -p$(cdbs_curpkg) debian/tmp/usr/share/eclipse/features/*
usr/share/eclipse/features
- dh_install -p$(cdbs_curpkg) debian/tmp/usr/share/eclipse/plugins/*
usr/share/eclipse/plugins
- rm -r $(CURDIR)/debian/tmp
+patch: patch-stamp
+patch-stamp: uncompress-stamp
+ dh_testdir
-clean::
- -find src/plugins/* -name "*src.zip" -exec rm {} ";"
- #-find src/plugins/* -name "doc.zip" -exec rm {} ";"
- #-find src/plugins/* -name "index" -exec rm -rf {} ";"
- #-find src/plugins/* -name "doc-files" -exec rm -rf {} ";"
- -rm $(CURDIR)/$(PDEBUILD_BUILDDIR)/R*/*.zip
+ cd $(BUILD_DIR) && \
+ for PATCH in $(CURDIR)/debian/patches/* ; do \
+ patch -p0 < $$PATCH; \
+ done
+ touch patch-stamp
+
+
+prepare: prepare-stamp
+prepare-stamp: patch-stamp
+ dh_testdir
+
+ touch prepare-stamp
+
+
+build: build-java
+build-java: build-java-stamp
+build-java-stamp: prepare-stamp
+ dh_testdir
+
+ cd $(BUILD_DIR)/src/eclipse; \
+ for f in /usr/lib/eclipse/* ; \
+ do cp -rL $$f .; \
+ done
+
+ cd $(BUILD_DIR) && \
+ $(ECLIPSE) \
+ -application org.eclipse.ant.core.antRunner \
+ -Dcomponent=sdk \
+ -DjavacFailOnError=true \
+ -DdontUnzip=true \
+ -DbaseLocation=$(BUILD_DIR)/src/eclipse \
+ -Dpde.build.scripts=$(PDEBUILD_ROOT)/scripts \
+ -DskipFetch=true \
+ -DbaseExists=true
+
+ cd $(BUILD_DIR) && \
+ $(ECLIPSE) \
+ -application org.eclipse.ant.core.antRunner \
+ -Dcomponent=examples \
+ -DjavacFailOnError=true \
+ -DdontUnzip=true \
+ -DbaseLocation=$(BUILD_DIR)/src/eclipse \
+ -Dpde.build.scripts=$(PDEBUILD_ROOT)/scripts \
+ -DskipFetch=true \
+ -DbaseExists=true
+
+ touch build-java-stamp
+
+install: install-stamp
+install-stamp: build-java-stamp
+ mkdir -p $(BUILD_DIR)/temp; \
+ cd $(BUILD_DIR)/temp; \
+ for FILE in ../src/eclipse/I*/*zip ; do \
+ unzip -o -qq $$FILE; \
+ done
+
+ touch install-stamp
+
+
+binary-indep: DH_OPTIONS=-i
+binary-indep: install-stamp
+ dh_testdir
+ dh_testroot
+
+ dh_install
+ dh_installdocs
+ dh_installexamples
+ dh_installmenu
+ dh_installman
+ dh_installinfo
+ dh_installchangelogs
+ dh_link
+ dh_fixperms
+
+ dh_makeshlibs
+ dh_shlibdeps
+ dh_compress
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch:
+
+binary: binary-indep binary-arch
+
+clean:
+ dh_testdir
+
+ rm -rf $(SOURCE_TREE) *-stamp
+
+ dh_clean
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
