Patch attached - no difference from the proposed one in #483279.
--
dann frazier
diff -u eclipse-3.2.2/debian/rules eclipse-3.2.2/debian/rules
--- eclipse-3.2.2/debian/rules
+++ eclipse-3.2.2/debian/rules
@@ -151,6 +151,7 @@
eclipse-ecj-gcj \
eclipse-add-ppc64-sparc64-s390-s390x \
eclipse-java-home \
+ eclipse-libswt-gtk-symlink-fix \
# eclipse-icon \
# eclipse-efj \
@@ -180,7 +181,7 @@
# eclipse-libswt-mozilla-profiles
- BUILD_DEPS += , libxul-dev
+ BUILD_DEPS += , iceape-dev
MOZILLA_DEP = $${shlibs:Depends}
MOZILLA_HOME = /usr/lib/mozilla
endif
diff -u eclipse-3.2.2/debian/control eclipse-3.2.2/debian/control
--- eclipse-3.2.2/debian/control
+++ eclipse-3.2.2/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
Uploaders: Jerry Haltom <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>, Matthias Klose <[EMAIL PROTECTED]>, Stephan Michels <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, default-jdk-builddep, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), junit4, libjsch-java (>= 0.1.36), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, libxul-dev
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, default-jdk-builddep, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), junit4, libjsch-java (>= 0.1.36), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, iceape-dev
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/eclipse
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/eclipse
diff -u eclipse-3.2.2/debian/changelog eclipse-3.2.2/debian/changelog
--- eclipse-3.2.2/debian/changelog
+++ eclipse-3.2.2/debian/changelog
@@ -1,3 +1,12 @@
+eclipse (3.2.2-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update build-dep from libxul-dev to iceape-dev. Closes: #480794
+ * Fix dangling /usr/lib/java/swt3.2-gtk.jar on ia64 and sparc.
+ Closes: #483279.
+
+ -- dann frazier <[EMAIL PROTECTED]> Wed, 08 Oct 2008 00:53:39 -0600
+
eclipse (3.2.2-6) unstable; urgency=low
* Suppress warnings from javac.
diff -u eclipse-3.2.2/debian/patches/eclipse-libswt-xulrunner.dpatch eclipse-3.2.2/debian/patches/eclipse-libswt-xulrunner.dpatch
--- eclipse-3.2.2/debian/patches/eclipse-libswt-xulrunner.dpatch
+++ eclipse-3.2.2/debian/patches/eclipse-libswt-xulrunner.dpatch
@@ -41,9 +41,9 @@
- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
- GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`
- GECKO_LIBS=`pkg-config --libs mozilla-xpcom`
-+ if [ x`pkg-config --exists xulrunner-xpcom && echo YES` = "xYES" ]; then
-+ GECKO_INCLUDES=`pkg-config --cflags xulrunner-xpcom`
-+ GECKO_LIBS=`pkg-config --libs xulrunner-xpcom`
++ if [ x`pkg-config --exists iceape-xpcom && echo YES` = "xYES" ]; then
++ GECKO_INCLUDES=`pkg-config --cflags iceape-xpcom`
++ GECKO_LIBS=`pkg-config --libs iceape-xpcom`
export GECKO_INCLUDES
export GECKO_LIBS
MAKE_MOZILLA=make_mozilla
only in patch2:
unchanged:
--- eclipse-3.2.2.orig/debian/patches/eclipse-libswt-gtk-symlink-fix.dpatch
+++ eclipse-3.2.2/debian/patches/eclipse-libswt-gtk-symlink-fix.dpatch
@@ -0,0 +1,161 @@
+#! /bin/sh -e
+##
+## DP: Debian specific patch, converted from eclipse-swt-x11.patch
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $patch_opts -p0 < $0;;
+ -unpatch)
+ patch $patch_opts -p0 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+exit 0
+
[EMAIL PROTECTED]@
+diff -urpN source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml 2007-02-12 18:45:20.000000000 +0000
++++ source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml 2008-10-08 01:48:44.000000000 +0000
+@@ -691,7 +691,7 @@
+ </antcall>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
+- <param name="elementName" value="org.eclipse.swt.motif.hpux.ia64_32_3.2.2.R3_2_maintenance"/>
++ <param name="elementName" value="org.eclipse.swt.motif.hpux.ia64_32_3.2.2.v3236"/>
+ </antcall>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
+@@ -850,7 +850,7 @@
+ <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.ui.workbench.compatibility_3.2.0.I20060605-1400"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.ui.workbench.texteditor_3.2.0.v20060605-1400.jar"/>
+- <arg line="${pluginArchivePrefix}/org.eclipse.swt.motif.hpux.ia64_32_3.2.2.R3_2_maintenance.jar"/>
++ <arg line="${pluginArchivePrefix}/org.eclipse.swt.motif.hpux.ia64_32_3.2.2.v3236.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.debug.ui_3.2.2.r322_v20070202.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.ui.forms_3.2.0.v20060602.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.ui.navigator_3.2.1.M20060913-0800.jar"/>
+diff -urpN source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ia64.xml source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-10-08 01:47:40.000000000 +0000
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-10-08 01:48:44.000000000 +0000
+@@ -565,7 +565,7 @@
+ </antcall>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
+- <param name="elementName" value="org.eclipse.swt.gtk.linux.ia64_3.2.2.R3_2_maintenance"/>
++ <param name="elementName" value="org.eclipse.swt.gtk.linux.ia64_3.2.2.v3236"/>
+ </antcall>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
+diff -urpN source-tree.orig/assemble.org.eclipse.sdk.solaris.gtk.x86.xml source-tree/assemble.org.eclipse.sdk.solaris.gtk.x86.xml
+--- source-tree.orig/assemble.org.eclipse.sdk.solaris.gtk.x86.xml 2007-02-12 18:45:20.000000000 +0000
++++ source-tree/assemble.org.eclipse.sdk.solaris.gtk.x86.xml 2008-10-08 01:48:44.000000000 +0000
+@@ -638,7 +638,7 @@
+ </antcall>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
+- <param name="elementName" value="org.eclipse.swt.gtk.solaris.x86_3.2.2.R3_2_maintenance"/>
++ <param name="elementName" value="org.eclipse.swt.gtk.solaris.x86_3.2.2.v3236"/>
+ </antcall>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
+@@ -819,7 +819,7 @@
+ <arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.runtime.compatibility.registry_3.2.1.R32x_v20060907"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.pde.source_3.2.1.r321_v20060823-6vYLLdQ3Nk8DrFG"/>
+- <arg line="${pluginArchivePrefix}/org.eclipse.swt.gtk.solaris.x86_3.2.2.R3_2_maintenance.jar"/>
++ <arg line="${pluginArchivePrefix}/org.eclipse.swt.gtk.solaris.x86_3.2.2.v3236.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.core_3.2.2.M20061205.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.jface.text_3.2.2.r322_v20070104.jar"/>
+ <arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.2.2.R32x_v20061218.jar"/>
+diff -urpN source-tree.orig/features/org.eclipse.rcp/build.xml source-tree/features/org.eclipse.rcp/build.xml
+--- source-tree.orig/features/org.eclipse.rcp/build.xml 2008-10-08 01:47:40.000000000 +0000
++++ source-tree/features/org.eclipse.rcp/build.xml 2008-10-08 01:48:46.000000000 +0000
+@@ -190,7 +190,7 @@
+ <copy todir="${feature.base}/features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}" includes="feature.xml,license.html,epl-v10.html,feature.properties,eclipse_update_120.jpg" />
+ </copy>
+- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/feature.xml" selfVersion="3.2.2.r322_v20070104-iwP0VLKnfFC923K" featureIds="" pluginIds="com.ibm.icu,3.4.5.20061213,org.eclipse.core.commands,3.2.0.I20060605-1400,org.eclipse.core.jobs,3.2.0.v20060603,org.eclipse.core.expressions,3.2.2.r322_v20070109a,org.eclipse.core.runtime,3.2.0.v20060603,org.eclipse.core.runtime.compatibility.auth,3.2.0.v20060601,org.eclipse.osgi,3.2.2.R32x_v20070118,org.eclipse.help,3.2.2.R322_v20061213,org.eclipse.swt,3.2.2.v3236b,org.eclipse.jface,3.2.2.M20061214-1200,org.eclipse.jface.databinding,1.0.0.I20060605-1400,org.eclipse.ui,3.2.1.M20061108,org.eclipse.ui.workbench,3.2.2.M20070119-0800,org.eclipse.update.configurator,3.2.2.R32x_v20070111,org.eclipse.swt.win32.win32.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.x86,3.2.2.v3236,org.eclipse.swt.gtk.solaris.sparc,3.2.2.v3236,org.eclipse.swt.gtk.solaris.x86,3.2.2.R3_2_maintenance,org.eclipse.swt.gtk.linux.ppc,3.2.2.v3236,org.eclipse.swt.gtk.linux.x86_64,3.2.2.v3236,org.eclipse.swt.carbon.macosx,3.2.2.v3236,org.eclipse.swt.motif.aix.ppc,3.2.2.v3236,org.eclipse.swt.motif.hpux.PA_RISC,3.2.2.v3236,org.eclipse.swt.motif.linux.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.ia64,3.2.2.R3_2_maintenance,org.eclipse.swt.motif.solaris.sparc,3.2.2.v3236,org.eclipse.swt.photon.qnx.x86,3.2.1.v3236,org.eclipse.swt.motif.hpux.ia64_32,3.2.2.R3_2_maintenance,org.eclipse.rcp,3.2.0.v20060605,org.eclipse.core.contenttype,3.2.0.v20060603,org.eclipse.equinox.common,3.2.0.v20060603,org.eclipse.equinox.preferences,3.2.1.R32x_v20060717,org.eclipse.equinox.registry,3.2.1.R32x_v20060814,"/>
++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/feature.xml" selfVersion="3.2.2.r322_v20070104-iwP0VLKnfFC923K" featureIds="" pluginIds="com.ibm.icu,3.4.5.20061213,org.eclipse.core.commands,3.2.0.I20060605-1400,org.eclipse.core.jobs,3.2.0.v20060603,org.eclipse.core.expressions,3.2.2.r322_v20070109a,org.eclipse.core.runtime,3.2.0.v20060603,org.eclipse.core.runtime.compatibility.auth,3.2.0.v20060601,org.eclipse.osgi,3.2.2.R32x_v20070118,org.eclipse.help,3.2.2.R322_v20061213,org.eclipse.swt,3.2.2.v3236b,org.eclipse.jface,3.2.2.M20061214-1200,org.eclipse.jface.databinding,1.0.0.I20060605-1400,org.eclipse.ui,3.2.1.M20061108,org.eclipse.ui.workbench,3.2.2.M20070119-0800,org.eclipse.update.configurator,3.2.2.R32x_v20070111,org.eclipse.swt.win32.win32.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.x86,3.2.2.v3236,org.eclipse.swt.gtk.solaris.sparc,3.2.2.v3236,org.eclipse.swt.gtk.solaris.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.ppc,3.2.2.v3236,org.eclipse.swt.gtk.linux.x86_64,3.2.2.v3236,org.eclipse.swt.carbon.macosx,3.2.2.v3236,org.eclipse.swt.motif.aix.ppc,3.2.2.v3236,org.eclipse.swt.motif.hpux.PA_RISC,3.2.2.v3236,org.eclipse.swt.motif.linux.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.ia64,3.2.2.v3236,org.eclipse.swt.motif.solaris.sparc,3.2.2.v3236,org.eclipse.swt.photon.qnx.x86,3.2.1.v3236,org.eclipse.swt.motif.hpux.ia64_32,3.2.2.v3236,org.eclipse.rcp,3.2.0.v20060605,org.eclipse.core.contenttype,3.2.0.v20060603,org.eclipse.equinox.common,3.2.0.v20060603,org.eclipse.equinox.preferences,3.2.1.R32x_v20060717,org.eclipse.equinox.registry,3.2.1.R32x_v20060814,"/>
+ <antcall target="rootFiles${os}_${ws}_${arch}"/>
+ </target>
+ <target name="rootFileswin32_win32_x86">
+diff -urpN source-tree.orig/plugins/org.eclipse.swt.gtk.linux.ia64/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/META-INF/MANIFEST.MF
+--- source-tree.orig/plugins/org.eclipse.swt.gtk.linux.ia64/META-INF/MANIFEST.MF 2007-02-12 18:46:35.000000000 +0000
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/META-INF/MANIFEST.MF 2008-10-08 01:48:55.000000000 +0000
+@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-v
+ Bundle-Name: %fragmentName
+ Bundle-Vendor: %providerName
+ Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ia64; singleton:=true
+-Bundle-Version: 3.2.2.R3_2_maintenance
++Bundle-Version: 3.2.2.v3236
+ Bundle-ManifestVersion: 2
+ Bundle-Localization: fragment
+ Export-Package:
+diff -urpN source-tree.orig/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml
+--- source-tree.orig/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml 2008-10-08 01:47:40.000000000 +0000
++++ source-tree/plugins/org.eclipse.swt.gtk.linux.ia64/build.xml 2008-10-08 01:48:55.000000000 +0000
+@@ -6,7 +6,7 @@
+ <property name="os" value="linux"/>
+ <property name="arch" value="ia64"/>
+ <property name="fragment" value="org.eclipse.swt.gtk.linux.ia64"/>
+- <property name="version.suffix" value="3.2.2.R3_2_maintenance"/>
++ <property name="version.suffix" value="3.2.2.v3236"/>
+ <property name="full.name" value="${fragment}_${version.suffix}"/>
+ <property name="temp.folder" value="${basedir}/temp.folder"/>
+ <property name="plugin.destination" value="${basedir}"/>
+diff -urpN source-tree.orig/plugins/org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF
+--- source-tree.orig/plugins/org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF 2007-02-12 18:46:52.000000000 +0000
++++ source-tree/plugins/org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF 2008-10-08 01:49:27.000000000 +0000
+@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-v
+ Bundle-Name: %fragmentName
+ Bundle-Vendor: %providerName
+ Bundle-SymbolicName: org.eclipse.swt.gtk.solaris.x86; singleton:=true
+-Bundle-Version: 3.2.2.R3_2_maintenance
++Bundle-Version: 3.2.2.v3236
+ Bundle-ManifestVersion: 2
+ Bundle-Localization: fragment
+ Export-Package:
+diff -urpN source-tree.orig/plugins/org.eclipse.swt.gtk.solaris.x86/build.xml source-tree/plugins/org.eclipse.swt.gtk.solaris.x86/build.xml
+--- source-tree.orig/plugins/org.eclipse.swt.gtk.solaris.x86/build.xml 2007-02-12 18:45:21.000000000 +0000
++++ source-tree/plugins/org.eclipse.swt.gtk.solaris.x86/build.xml 2008-10-08 01:49:27.000000000 +0000
+@@ -6,7 +6,7 @@
+ <property name="os" value="solaris"/>
+ <property name="arch" value="x86"/>
+ <property name="fragment" value="org.eclipse.swt.gtk.solaris.x86"/>
+- <property name="version.suffix" value="3.2.2.R3_2_maintenance"/>
++ <property name="version.suffix" value="3.2.2.v3236"/>
+ <property name="full.name" value="${fragment}_${version.suffix}"/>
+ <property name="temp.folder" value="${basedir}/temp.folder"/>
+ <property name="plugin.destination" value="${basedir}"/>
+diff -urpN source-tree.orig/plugins/org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF source-tree/plugins/org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF
+--- source-tree.orig/plugins/org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF 2007-02-12 18:46:45.000000000 +0000
++++ source-tree/plugins/org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF 2008-10-08 01:49:14.000000000 +0000
+@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt; bundle-v
+ Bundle-Name: %fragmentName
+ Bundle-Vendor: %providerName
+ Bundle-SymbolicName: org.eclipse.swt.motif.hpux.ia64_32; singleton:=true
+-Bundle-Version: 3.2.2.R3_2_maintenance
++Bundle-Version: 3.2.2.v3236
+ Bundle-ManifestVersion: 2
+ Bundle-Localization: fragment
+ Export-Package:
+diff -urpN source-tree.orig/plugins/org.eclipse.swt.motif.hpux.ia64_32/build.xml source-tree/plugins/org.eclipse.swt.motif.hpux.ia64_32/build.xml
+--- source-tree.orig/plugins/org.eclipse.swt.motif.hpux.ia64_32/build.xml 2007-02-12 18:45:20.000000000 +0000
++++ source-tree/plugins/org.eclipse.swt.motif.hpux.ia64_32/build.xml 2008-10-08 01:49:14.000000000 +0000
+@@ -6,7 +6,7 @@
+ <property name="os" value="hpux"/>
+ <property name="arch" value="ia64_32"/>
+ <property name="fragment" value="org.eclipse.swt.motif.hpux.ia64_32"/>
+- <property name="version.suffix" value="3.2.2.R3_2_maintenance"/>
++ <property name="version.suffix" value="3.2.2.v3236"/>
+ <property name="full.name" value="${fragment}_${version.suffix}"/>
+ <property name="temp.folder" value="${basedir}/temp.folder"/>
+ <property name="plugin.destination" value="${basedir}"/>
