[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. c2a5d7d6070fb07db39e627a7fdccbed31b7dd18

Sat Jan 30 11:52:21 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 - Powerful IDE written in java - Debian package.".

The branch, master has been updated
       via  c2a5d7d6070fb07db39e627a7fdccbed31b7dd18 (commit)
      from  636de0e60bb551788b49c5c2d6085439e4a6874c (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 c2a5d7d6070fb07db39e627a7fdccbed31b7dd18
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jan 30 12:52:00 2010 +0100

    Merge our libswt binaries into eclipse-rcp.

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

Summary of changes:
 debian/changelog                   |    2 +-
 debian/control                     |   65 ++++-------------------------------
 debian/eclipse-rcp.install         |    2 +
 debian/libswt-eclipse-java.install |    2 -
 debian/rules                       |   23 ++++--------
 5 files changed, 19 insertions(+), 75 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d292610..b23ebd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,7 +43,7 @@ eclipse (3.5.1+repack-1) UNRELEASED; urgency=low
   * Set a sane file limit for osgi-bundles. (Closes: #558693, LP: #293573)
   * Inject update sites on first run. (LP: #460944)
   * Prevent conflict with swt-gtk's swt packages.
-    - Rename our swt packages.
+    - Removed our swt packages.
     - Do not install conflicting symlinks/files.
     (Closes: #541638, LP: #491880)
   * Imported patch from Fedora that fixes seg. faults in libpango.
diff --git a/debian/control b/debian/control
index f2abdd5..221110a 100644
--- a/debian/control
+++ b/debian/control
@@ -198,8 +198,15 @@ Depends: default-jre | java1-runtime | java2-runtime | java5-runtime | java6-run
          libswt-eclipse-java (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
+Recommends: ${shlibs:Recommends}
 Suggests: eclipse
-Replaces: eclipse-rcp-gcj
+Replaces: eclipse-rcp-gcj,
+          libswt3.2-gtk-java,
+          libswt3.2-gtk-gcj,
+          libswt3.2-gtk-jni,
+          libswt-gtk-3.4-java,
+          libswt-gtk-3.4-jni,
+          libswt-gtk-3.5-jni (<< 3.5.1+repack)
 Description: Eclipse Rich Client Platform (RCP)
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
@@ -234,59 +241,3 @@ Description: Equinox OSGi framework
  This package includes only the Eclipse Equinox OSGi framework, which can
  be used outside Eclipse.
 
-Package: libswt-eclipse-java
-Architecture: any
-Depends: default-jre | java1-runtime | java2-runtime | java5-runtime | java6-runtime,
-         java-common (>= 0.23),
-         libswt-eclipse-jni (= ${binary:Version}),
-         ${misc:Depends}
-Conflicts: libswt3.2-java
-Replaces: eclipse-platform (<< 3.5.1+repack),
-          libswt3.2-java,
-          libswt-gtk-3.4-java-gcj,
-          libswt-gtk-3.4-java
-Description: Standard Widget Toolkit for Java, GTK+ version
- The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
- programming language. SWT provides efficient, portable and fast access to
- native-looking controls and user interface facilities on the platforms where
- it has been implemented.
- .
- The functionally is similar to Swing, but in addition, SWT has access to
- some Operative System's widgets the former has not.
- Swing provides native-looking control emulation, but built on top of the JVM.
- In SWT, the UI code is native by using Java Native Interface (JNI) libraries,
- so it runs significantly faster when providing native look and feel for
- applications.
- .
- SWT is mainly used in the Eclipse Platform, but being an open source library,
- it's used in external programs too.
- .
- This package provides the packaged SWT libraries.
-
-Package: libswt-eclipse-jni
-Architecture: any
-Depends: default-jre | java1-runtime | java2-runtime | java5-runtime | java6-runtime,
-         ${shlibs:Depends},
-         ${misc:Depends}
-Recommends: ${shlibs:Recommends}
-Conflicts: libswt3.2-jni
-Replaces: libswt3.2-jni,
-          libswt-gtk-3.4-jni,
-          libswt-gtk-3.5-jni (<< 3.5.1+repack)
-Description: Standard Widget Toolkit for Java, GTK+ version JNI libraries
- The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
- programming language. SWT provides efficient, portable and fast access to
- native-looking controls and user interface facilities on the platforms where
- it has been implemented.
- .
- The functionally is similar to Swing, but in addition, SWT has access to
- some Operative System's widgets the former has not.
- Swing provides native-looking control emulation, but built on top of the JVM.
- In SWT, the UI code is native by using Java Native Interface (JNI) libraries,
- so it runs significantly faster when providing native look and feel for
- applications.
- .
- SWT is mainly used in the Eclipse Platform, but being an open source library,
- it's used in external programs too.
- .
- This package provides the native libraries implemented using JNI.
diff --git a/debian/eclipse-rcp.install b/debian/eclipse-rcp.install
index 9b8a709..c4caed1 100644
--- a/debian/eclipse-rcp.install
+++ b/debian/eclipse-rcp.install
@@ -48,6 +48,8 @@ usr/lib/eclipse/plugins/org.eclipse.jface.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.jface_*.jar
 usr/lib/eclipse/plugins/org.eclipse.rcp.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.rcp_*.jar
+usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.*.jar
+usr/lib/eclipse/plugins/org.eclipse.swt_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ui.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ui.workbench.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ui.workbench_*.jar
diff --git a/debian/libswt-eclipse-java.install b/debian/libswt-eclipse-java.install
deleted file mode 100644
index a529778..0000000
--- a/debian/libswt-eclipse-java.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.*.jar
-usr/lib/eclipse/plugins/org.eclipse.swt_*.jar
diff --git a/debian/rules b/debian/rules
index 063ed3e..0da7a48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,9 +38,12 @@ DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar
 export JAVA_HOME=/usr/lib/jvm/default-java
 export PATH:=$(CURDIR)/debian/extra/bin:$(PATH)
 
-JNI_SO_PATH:=debian/libswt-eclipse-jni/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp
+JNI_SO_PATH:=debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp
 
-DEB_DH_SHLIBDEPS_ARGS_libswt-eclipse-jni := \
+SHARED_LIBS := $(shell find $(JNI_SO_PATH) -name '*.so' | grep -v libswt-)
+LAUNCHER_LIB := debian/eclipse-rcp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.*/eclipse_*.so
+
+DEB_DH_SHLIBDEPS_ARGS_eclipse-rcp := \
 	$(strip $(shell pkg-config --libs-only-L libxul | sed "s/-L/-l/g")):$(JAVA_HOME)/jre/lib/$(DEB_HOST_ARCH_CPU) \
 	-- -dDepends \
 		$(JNI_SO_PATH)/libswt-gtk-*.so \
@@ -50,10 +53,12 @@ DEB_DH_SHLIBDEPS_ARGS_libswt-eclipse-jni := \
 		$(JNI_SO_PATH)/libswt-pi-gtk-*.so \
 		$(JNI_SO_PATH)/libswt-xpcominit-gtk-*.so \
 		$(JNI_SO_PATH)/libswt-xulrunner-gtk-*.so \
+		$(SHARED_LIBS) \
+		$(LAUNCHER_LIB) \
 	-dRecommends \
 		$(JNI_SO_PATH)/libswt-gnome-gtk-*.so \
 		$(JNI_SO_PATH)/libswt-glx-gtk-*.so \
-	-Tdebian/libswt-eclipse-jni.substvars
+	-Tdebian/eclipse-rcp.substvars
 
 clean::
 	rm -f *.cdbs-config_list
@@ -77,15 +82,7 @@ binary-post-install/libequinox-osgi-java::
 
 binary-post-install/eclipse-rcp::
 	@echo "*** binary-post-install/eclipse-rcp ***"
-	# This script is stored in a patch, so the exec bit is not set the first time.
-	test -x swt_bundle.sh || chmod a+x swt_bundle.sh
-	# Extract swt's bundle from eclipse-rcp where all the other bundles are installed.
-	$(DEB_ANT_INVOKE) -Dprefix=/usr -Dlibdir=/lib -Declipse.rcp.package.root=debian/eclipse-rcp/ \
-	    -Declipse.swt.package.root=debian/libswt-eclipse-jni package.extract.swt
-	# Remove outdated libraries or else shlibdeps will fail later.
 	rm -f debian/libswt-eclipse-jni/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp/libswt-mozilla-gcc*
-	# mkdir -p debian/libswt-eclipse-jni/usr/lib/jni
-	# cd debian/libswt-eclipse-jni/usr/lib/jni && find ../eclipse/configuration/ -name '*.so' -exec ln -s {} . \;
 
 # TODO: Turn all commands below this comment into patches and send them to eclipse-build.
 
@@ -154,10 +151,6 @@ debian-install-stamp:
 			-artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata \
 			-application org.eclipse.equinox.initializer.configInitializer \
 			-fileInitializer $(CURDIR)/debian/extract_patterns.txt
-	# Copy SWT jar file
-	#mkdir -p $(DEB_DESTDIR)usr/lib/java
-	#cp $(SOURCE_DIR)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_BUILD_ARCH)/swt.jar \
-	#	$(DEB_DESTDIR)usr/lib/java/swt-gtk-3.5.1.jar
 	# Normalize the paths.
 	grep --exclude-from=debian/exclude_patterns.txt -l -I -r debian/tmp debian/tmp/ | xargs sed -i s@$(CURDIR)/debian/tmp@@g
 	TO_CORRECT=`echo $(CURDIR)/debian/tmp | sed s@/@_ at g` ; grep --exclude-from=debian/exclude_patterns.txt \


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.

