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

Mon Jan 25 13:54:58 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  09ef820da646eb611ae3d5bf33c14ef41c4b0552 (commit)
      from  36bcd68d79fbf4484128e027fb16727f6dfd9be7 (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 09ef820da646eb611ae3d5bf33c14ef41c4b0552
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Jan 25 14:54:31 2010 +0100

    Avoid conflicts with swt-gtk.

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

Summary of changes:
 debian/changelog                   |    4 +++
 debian/control                     |   21 +++++++++++-------
 debian/eclipse-platform.install    |    2 -
 debian/extra/eclipse               |   10 ++++----
 debian/libswt-eclipse-java.install |    2 +
 debian/libswt-gtk-3.5-java.install |    1 -
 debian/rules                       |   40 ++++++++++++++++++-----------------
 7 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 144fe1e..987ef0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,10 @@ eclipse (3.5.1+repack-1) UNRELEASED; urgency=low
   * Move eclipse.ini into /etc (LP: #43162)
   * 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.
+    - Do not install conflicting symlinks/files.
+    (Closes: #541638, LP: #491880)
 
  -- Debian Orbital Alignment Team <pkg-java-maintainers at lists.alioth.debian.org>  Tue, 01 Dec 2009 20:28:17 +0100
 
diff --git a/debian/control b/debian/control
index d8c5052..238ce3a 100644
--- a/debian/control
+++ b/debian/control
@@ -116,7 +116,7 @@ Depends: default-jre | java1-runtime | java2-runtime | java5-runtime | java6-run
          liblucene2-java (>= 2.9.1+ds1-5),
          libservlet2.4-java (>= 5.0.30-10),
          libservlet2.5-java (>= 6.0.20-8),
-         libswt-gtk-3.5-java (= ${binary:Version}),
+         libswt-eclipse-java (= ${binary:Version}),
          sat4j (>= 2.1.0),
          xulrunner-1.9.1,
          ${misc:Depends},
@@ -192,7 +192,7 @@ Package: eclipse-rcp
 Architecture: any
 Depends: default-jre | java1-runtime | java2-runtime | java5-runtime | java6-runtime,
          libequinox-osgi-java (= ${source:Version}),
-         libswt-gtk-3.5-java (= ${binary:Version}),
+         libswt-eclipse-java (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Suggests: eclipse
@@ -231,15 +231,18 @@ Description: Equinox OSGi framework
  This package includes only the Eclipse Equinox OSGi framework, which can
  be used outside Eclipse.
 
-Package: libswt-gtk-3.5-java
+Package: libswt-eclipse-java
 Architecture: any
 Depends: default-jre | java1-runtime | java2-runtime | java5-runtime | java6-runtime,
          java-common (>= 0.23),
-         libswt-gtk-3.5-jni (= ${binary:Version}),
+         libswt-eclipse-jni (= ${binary:Version}),
          ${misc:Depends}
 Conflicts: libswt3.2-java
-Replaces: libswt3.2-java,
-          libswt-gtk-3.4-java-gcj
+Replaces: eclipse-platform (<< 3.5.1+repack),
+          libswt3.2-java,
+          libswt-gtk-3.4-java-gcj,
+          libswt-gtk-3.4-java,
+          libswt-gtk-3.5-java (<< 3.5.1+repack)
 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
@@ -258,14 +261,16 @@ Description: Standard Widget Toolkit for Java, GTK+ version
  .
  This package provides the packaged SWT libraries.
 
-Package: libswt-gtk-3.5-jni
+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
+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
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index 15c9789..c7d4195 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -181,8 +181,6 @@ usr/lib/eclipse/plugins/org.eclipse.platform_*
 usr/lib/eclipse/plugins/org.eclipse.sdk_*
 usr/lib/eclipse/plugins/org.eclipse.search.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.search_*.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.team.core.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.team.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.team.ui.source_*.jar
diff --git a/debian/extra/eclipse b/debian/extra/eclipse
index 506cfd9..4984f45 100644
--- a/debian/extra/eclipse
+++ b/debian/extra/eclipse
@@ -7,9 +7,9 @@ export GDK_NATIVE_WINDOWS=true
 
 xuldir=/usr/lib/xulrunner-$(/usr/bin/xulrunner-1.9.1 --gre-version)
 
-run_eclipse() {
-    LD_LIBRARY_PATH=$xuldir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} /usr/lib/eclipse/eclipse "$@"
-}
+export LD_LIBRARY_PATH="$xuldir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+
+ECLIPSE=/usr/lib/eclipse/eclipse
 
 inject_update_site(){
     if [ ! -e "$1" ] ; then
@@ -27,7 +27,7 @@ EOF
 
 
 if [ ! -e ~/eclipse/ ] ; then
-    run_eclipse -clean -initialize
+    $ECLIPSE -clean -initialize || exit $?
     settings=`echo ~/.eclipse/org.eclipse.platform_*/p2/org.eclipse.equinox.p2.engine/profileRegistry/PlatformProfile.profile/.data/.settings/`
     if [ ! -d "$settings" ] ; then
 	echo "W: Cannot inject update-sites, cannot find the correct config." 2>&1
@@ -38,4 +38,4 @@ if [ ! -e ~/eclipse/ ] ; then
     fi
 fi
 
-run_eclipse "$@"
+exec $ECLIPSE "$@"
diff --git a/debian/libswt-eclipse-java.install b/debian/libswt-eclipse-java.install
new file mode 100644
index 0000000..a529778
--- /dev/null
+++ b/debian/libswt-eclipse-java.install
@@ -0,0 +1,2 @@
+usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.*.jar
+usr/lib/eclipse/plugins/org.eclipse.swt_*.jar
diff --git a/debian/libswt-gtk-3.5-java.install b/debian/libswt-gtk-3.5-java.install
deleted file mode 100644
index 635c6a0..0000000
--- a/debian/libswt-gtk-3.5-java.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/java/swt-gtk-3.5.1.jar
diff --git a/debian/rules b/debian/rules
index ea44e3e..964877e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,20 +38,22 @@ DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar
 export JAVA_HOME=/usr/lib/jvm/default-java
 export PATH:=$(CURDIR)/debian/extra/bin:$(PATH)
 
-DEB_DH_SHLIBDEPS_ARGS_libswt-gtk-3.5-jni := \
-	$(strip $(shell pkg-config --libs-only-L libxul | sed "s/-L/-l/g")):/usr/lib/jvm/default-java/jre/lib/$(DEB_HOST_ARCH_CPU) \
+JNI_SO_PATH:=debian/libswt-eclipse-jni/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp
+
+DEB_DH_SHLIBDEPS_ARGS_libswt-eclipse-jni := \
+	$(strip $(shell pkg-config --libs-only-L libxul | sed "s/-L/-l/g")):$(JAVA_HOME)/jre/lib/$(DEB_HOST_ARCH_CPU) \
 	-- -dDepends \
-		debian/libswt-gtk-3.5-jni/usr/lib/jni/libswt-gtk-*.so \
-		debian/libswt-gtk-3.5-jni/usr/lib/jni/libswt-atk-gtk-*.so \
-		debian/libswt-gtk-3.5-jni/usr/lib/jni/libswt-awt-gtk-*.so \
-		debian/libswt-gtk-3.5-jni/usr/lib/jni/libswt-cairo-gtk-*.so \
-		debian/libswt-gtk-3.5-jni/usr/lib/jni/libswt-pi-gtk-*.so \
-		debian/libswt-gtk-3.5-jni/usr/lib/jni/libswt-xpcominit-gtk-*.so \
-		debian/libswt-gtk-3.5-jni/usr/lib/jni/libswt-xulrunner-gtk-*.so \
+		$(JNI_SO_PATH)/libswt-gtk-*.so \
+		$(JNI_SO_PATH)/libswt-atk-gtk-*.so \
+		$(JNI_SO_PATH)/libswt-awt-gtk-*.so \
+		$(JNI_SO_PATH)/libswt-cairo-gtk-*.so \
+		$(JNI_SO_PATH)/libswt-pi-gtk-*.so \
+		$(JNI_SO_PATH)/libswt-xpcominit-gtk-*.so \
+		$(JNI_SO_PATH)/libswt-xulrunner-gtk-*.so \
 	-dRecommends \
-		debian/libswt-gtk-3.5-jni/usr/lib/jni/libswt-gnome-gtk-*.so \
-		debian/libswt-gtk-3.5-jni/usr/lib/jni/libswt-glx-gtk-*.so \
-	-Tdebian/libswt-gtk-3.5-jni.substvars
+		$(JNI_SO_PATH)/libswt-gnome-gtk-*.so \
+		$(JNI_SO_PATH)/libswt-glx-gtk-*.so \
+	-Tdebian/libswt-eclipse-jni.substvars
 
 clean::
 	rm -f *.cdbs-config_list
@@ -79,11 +81,11 @@ binary-post-install/eclipse-rcp::
 	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-gtk-3.5-jni package.extract.swt
+	    -Declipse.swt.package.root=debian/libswt-eclipse-jni package.extract.swt
 	# Remove outdated libraries or else shlibdeps will fail later.
-	rm -f debian/libswt-gtk-3.5-jni/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp/libswt-mozilla-gcc*
-	mkdir -p debian/libswt-gtk-3.5-jni/usr/lib/jni
-	cd debian/libswt-gtk-3.5-jni/usr/lib/jni && find ../eclipse/configuration/ -name '*.so' -exec ln -s {} . \;
+	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.
 
@@ -153,9 +155,9 @@ debian-install-stamp:
 			-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
+	#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.

