[SCM] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0_rc2-3-10-gbec5fa4

[Niels Thykier]

The following commit has been merged in the master-3.8 branch:
commit 7c71d3bcca539b84885cff1e9a7bde8d032741e6
Author: Niels Thykier <niels at thykier.net>
Date:   Thu May 24 08:45:44 2012 +0200

    Remove alternatives for swt.jar
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 053904d..b2309b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ swt-gtk (3.7.2-3) UNRELEASED; urgency=low
     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.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 08 Apr 2012 22:41:29 +0200
 
diff --git a/debian/libswt-gtk-3-java.links b/debian/libswt-gtk-3-java.links
index 946c6c3..f469179 100644
--- a/debian/libswt-gtk-3-java.links
+++ b/debian/libswt-gtk-3-java.links
@@ -1 +1,2 @@
 usr/lib/java/swt-gtk-3.7.2.jar usr/share/java/swt-gtk-3.7.jar
+usr/lib/java/swt-gtk-3.7.2.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 eceed51..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.7.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 f5571e4..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.7.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.