Bug#483279: patch
tag 483279 + patch
thanks
Attached is a patch that fixes the issue for me on ia64. Note that
this issue also affects sparc. I plan to do a few more tests tomorrow
and, if successful, proceed with an NMU.
fyi, the attached patch also includes the fix for #480794, which is
needed to build in unstable.
--
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.0 +
source-tree/assemble.org.eclipse.sdk.hpux.motif.ia64_32.xml 2008-10-08 01:48:44.0 +
+@@ -691,7 +691,7 @@
+
+
+
+-
++
+
+
+
+@@ -850,7 +850,7 @@
+
+
+
+-
++
+
+
+
+diff -urpN source-tree.orig/assemble.org.eclipse.sdk.linux.gtk.ia64.xml source-tree/assemble.org.eclipse.sdk.linu
Bug#483279: patch tested, issue persists
fyi, I tested a modified version of Philippe's patch, but the issue
persists. I'll attach the exact patch I used which fixes #480794 and
drops the '-v' option from the sed call, which isn't a valid option.
The following output demonstrates the still-incorrect symlink:
$ dpkg -c libswt3.2-gtk-java_3.2.2-6.0~rzr1dannf2_ia64.deb
drwxr-xr-x root/root 0 2008-09-18 15:32 ./
drwxr-xr-x root/root 0 2008-09-18 14:54 ./usr/
drwxr-xr-x root/root 0 2008-09-18 14:53 ./usr/lib/
drwxr-xr-x root/root 0 2008-09-18 14:54 ./usr/lib/java/
drwxr-xr-x root/root 0 2008-09-18 14:53 ./usr/lib/eclipse/
drwxr-xr-x root/root 0 2008-09-18 14:53 ./usr/lib/eclipse/plugins/
-rw-r--r-- root/root 1706588 2008-09-18 11:50
./usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.ia64_3.2.2.R3_2_maintenance.jar
drwxr-xr-x root/root 0 2008-09-18 14:54 ./usr/share/
drwxr-xr-x root/root 0 2008-09-18 14:54 ./usr/share/doc/
drwxr-xr-x root/root 0 2008-09-18 14:54
./usr/share/doc/libswt3.2-gtk-java/
-rw-r--r-- root/root 15524 2008-09-17 23:16
./usr/share/doc/libswt3.2-gtk-java/copyright
-rw-r--r-- root/root 16717 2008-09-17 23:16
./usr/share/doc/libswt3.2-gtk-java/changelog.Debian.gz
lrwxrwxrwx root/root 0 2008-09-18 14:54 ./usr/lib/java/swt-gtk.jar ->
swt3.2-gtk.jar
lrwxrwxrwx root/root 0 2008-09-18 14:54 ./usr/lib/java/swt.jar ->
swt3.2-gtk.jar
lrwxrwxrwx root/root 0 2008-09-18 14:54 ./usr/lib/java/swt3.2-gtk.jar
-> ../eclipse/plugins/org.eclipse.swt.gtk.linux.ia64_3.2.2.v3236.jar
--
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
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
DISTRIBUTION := $(shell lsb_release -is)
@@ -180,7 +180,7 @@
# eclipse-libswt-mozilla-profiles
- BUILD_DEPS += , libxul-dev
+ BUILD_DEPS += , iceape-dev
MOZILLA_DEP = $${shlibs:Depends}
MOZILLA_HOME = /usr/lib/mozilla
endif
@@ -339,6 +339,9 @@
dh_testdir
ifneq (,$(findstring _$(ECLIPSE_PLATFORM)_,$(ECLIPSE_UNOFFICIAL_PLATFORMS)))
+# Set release version also for unsupported arch
+ -find "source-tree" -type f -iname "build.xml" -exec \
+ sed --in-place "s|\(.*\)|\1${REL}\2|g" "{}" \;
## Nasty hack to get support for ppc64, s390{,x}, sparc{,64} and hppa
# there is only partial support for ppc64 in 3.2 so we have to remove this
# partial support to get the replacemnt hack to work
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,20 @@
+eclipse (3.2.2-6.0~rzr1dannf2) dannf; urgency=low
+
+ * Fix sed syntax in swt jar rename fix (sed has no -v option)
+
+ -- dann frazier <[EMAIL PROTECTED]> Tue, 16 Sep 2008 16:23:29 +
+
+eclipse (3.2.2-6.0~rzr1dannf1) unstable; urgency=low
+
+ [ Philippe Coval ]
+ * Non-maintainer upload.
+ * WIP: Rename swt jar for ia64 arch. Closes #483279
+
+ [ dann frazier ]
+ * Build-dep on iceape-dev instead of libxul-dev
+
+ -- dann frazier <[EMAIL PROTECTED]> Wed, 10 Sep 2008 21:27:01 -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-conf
