The following commit has been merged in the master-3.8 branch:
commit 20c4b3c1d46c9fa4396f08fe7bfc10f45316f59b
Author: Niels Thykier <ni...@thykier.net>
Date: Thu May 24 08:45:44 2012 +0200
Remove alternatives for swt.jar
Signed-off-by: Niels Thykier <ni...@thykier.net>
Conflicts:
debian/changelog
debian/libswt-gtk-3-java.links
debian/libswt-gtk-3-java.postinst
debian/libswt-gtk-3-java.preinst
diff --git a/debian/changelog b/debian/changelog
index 396d44d..bd46e8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+swt-gtk (3.8.0~m7-3) UNRELEASED; urgency=low
+
+ * Use breaks to ensure that the SWT JNI libraries are upgraded
+ together with the Java package.
+ * Add conflicts with older versions of SWT and its JNI libraries.
+ This avoid this issue new and old versions of SWT and its JNI
+ libraries being used (and crashing). (Closes: #670756,
+ LP: #1000272)
+ * Remove alternatives for /usr/share/java/swt.jar.
+
+ -- Niels Thykier <ni...@thykier.net> Thu, 24 May 2012 09:44:43 +0200
+
swt-gtk (3.8.0~m7-2) experimental; urgency=low
* Fix build on 64-bit platforms.
diff --git a/debian/libswt-gtk-3-java.links b/debian/libswt-gtk-3-java.links
index 4e00acd..1a459af 100644
--- a/debian/libswt-gtk-3-java.links
+++ b/debian/libswt-gtk-3-java.links
@@ -1 +1,2 @@
usr/lib/java/swt-gtk-3.8.0.jar usr/share/java/swt-gtk-3.8.jar
+usr/lib/java/swt-gtk-3.8.0.jar usr/share/java/swt.jar
diff --git a/debian/libswt-gtk-3-java.postinst
b/debian/libswt-gtk-3-java.postinst
deleted file mode 100644
index bdd69fa..0000000
--- a/debian/libswt-gtk-3-java.postinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-set -e
-
-case "$1" in
- configure)
- update-alternatives --install \
- /usr/share/java/swt.jar \
- swt.jar \
- /usr/share/java/swt-gtk-3.8.jar \
- 103
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libswt-gtk-3-java.prerm b/debian/libswt-gtk-3-java.preinst
similarity index 51%
rename from debian/libswt-gtk-3-java.prerm
rename to debian/libswt-gtk-3-java.preinst
index a0e8380..84ae327 100644
--- a/debian/libswt-gtk-3-java.prerm
+++ b/debian/libswt-gtk-3-java.preinst
@@ -2,11 +2,10 @@
set -e
case "$1" in
- remove|upgrade|deconfigure)
- update-alternatives --remove swt.jar \
- /usr/share/java/swt-gtk-3.8.jar
- ;;
- failed-upgrade)
+ install|upgrade)
+ if update-alternatives --list swt.jar >/dev/null 2>&1 ; then
+ update-alternatives --remove-all swt.jar
+ fi
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
--
Debian packaging for swt-gtk.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
