Merge lp:~james-page/ubuntu/quantal/icedtea-web/java7-transition into lp:ubuntu/quantal/icedtea-web

[James Page]

Updates for transition to Java 7 as default including:

- Build with openjdk-7
- Prefer java 7 over java 6

[lp:~james-page/ubuntu/quantal/icedtea-web/java7-transition]

45. By James Page on 2012-07-11

Minor tweak to check for upgrade alternate/delete

[Clint Byrum (clint-fewbar)]

This looks good, but I will defer to doko for uploading.

review: Approve

=== modified file 'debian/PLUGIN7.postinst.in'
--- debian/PLUGIN7.postinst.in	2012-03-05 06:00:36 +0000
+++ debian/PLUGIN7.postinst.in	2012-07-11 10:11:44 +0000
@@ -13,31 +13,41 @@
 
 case "$1" in
     configure)
-	for browser_dir in $browser_dirs; do
-	    if [ $browser_dir = xulrunner-addons ]; then
-		browser=xulrunner-1.9
-	    else
-		browser=$browser_dir
-	    fi
+        for browser_dir in $browser_dirs; do
+            if [ $browser_dir = xulrunner-addons ]; then
+                browser=xulrunner-1.9
+            else
+                browser=$browser_dir
+            fi
 
-	    if [ -n "$multiarch" ] && [ "$DPKG_MAINTSCRIPT_ARCH" != $(dpkg --print-architecture) ]; then
-		priority=$(expr $priority - 1)
-	    fi
+            if [ -n "$multiarch" ] && [ "$DPKG_MAINTSCRIPT_ARCH" != $(dpkg --print-architecture) ]; then
+                priority=$(expr $priority - 1)
+            fi
 
             if [ -n "$multiarch" ] && [ -n "$2" ]; then
                 if [ -n "$(update-alternatives --list $browser-javaplugin.so 2>/dev/null | grep ^$old_basedir/)" ]; then
-		    update-alternatives --remove $browser-javaplugin.so $OLD_PLUGINPTH || true
-                fi
-	    fi
+                    update-alternatives --remove $browser-javaplugin.so $OLD_PLUGINPTH || true
+                fi
+            fi
+
+            if [ -n "$2" ]; then
+                # Check to see if alternates priority needs to be upgraded
+                install_priority=$(update-alternatives --query $browser-javaplugin.so | \
+                                   grep "Alternative: $PLUGINPTH" -A1 | sed -rne 's,^Priority: (.*),\1,p')
+                if [ -n "$install_priority" ] && [ "$priority" != "$install_priority" ]; then
+                    # Remove current alternate - it will get re-installed later
+                    update-alternatives --remove $browser-javaplugin.so $PLUGINPTH || true
+                fi
+            fi
 
             if [ -z "$(update-alternatives --list $browser-javaplugin.so 2>/dev/null | grep ^$basedir/)" ]; then
-		update-alternatives --quiet --install \
-		    /usr/lib/$browser_dir/plugins/libjavaplugin.so \
-		    $browser-javaplugin.so \
-		    $PLUGINPTH \
-		    $priority
-	    fi
-	done
+                update-alternatives --quiet --install \
+                    /usr/lib/$browser_dir/plugins/libjavaplugin.so \
+                    $browser-javaplugin.so \
+                    $PLUGINPTH \
+                    $priority
+            fi
+        done
 esac
 
 #DEBHELPER#

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-09 16:44:35 +0000
+++ debian/changelog	2012-07-11 10:11:44 +0000
@@ -1,3 +1,19 @@
+icedtea-web (1.2-2ubuntu2) quantal; urgency=low
+
+  * Transition to openjdk-7 as default-java:
+    - d/control: icedtea-plugin Depends: icedtea-6-plugin -> icedtea-7-plugin.
+    - d/control: Build-Depend openjdk-6-jdk -> openjdk-7-jdk.
+    - d/control: icedtea-netx: Make openjdk-7-jre the primary dependency.
+    - d/rules: Use openjdk-7 to configure/build icedtea-web, pickup openjdk-7
+      png files.
+    - d/PLUGIN7.postinst.in: Added code to remove existing alternate if 
+      priority has changed in anyway from that of the installed version.
+      This triggers a re-install later in the script with the updated
+      priority.
+    - d/rules: Prioritize java7 version above java6.
+
+ -- James Page <[e-mail]>  Mon, 09 Jul 2012 12:46:15 +0100
+
 icedtea-web (1.2-2ubuntu1) precise; urgency=low
 
   * Regenerate the control file.

=== modified file 'debian/control'
--- debian/control	2012-04-09 16:44:35 +0000
+++ debian/control	2012-07-11 10:11:44 +0000
@@ -1,9 +1,10 @@
 Source: icedtea-web
 Section: java
 Priority: extra
-Maintainer: OpenJDK Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: OpenJDK Team <[e-mail]>
 Uploaders: Matthias Klose <[e-mail]>, Damien Raude-Morvan <[e-mail]>
-Build-Depends: debhelper (>= 5), firefox-dev, openjdk-6-jdk (>= 6b23~pre10~), zip, lsb-release, libgtk2.0-dev, pkg-config, default-jre-headless
+Build-Depends: debhelper (>= 5), firefox-dev, openjdk-7-jdk, zip, lsb-release, libgtk2.0-dev, pkg-config, default-jre-headless
 Standards-Version: 3.9.3
 Homepage: http://icedtea.classpath.org/wiki/IcedTea-Web
 Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/icedtea-web
@@ -12,7 +13,7 @@
 Package: icedtea-netx
 Architecture: any
 Multi-Arch: same
-Depends: ${netx:Depends}, openjdk-6-jre (>= 6b23~pre10~) | openjdk-7-jre, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${netx:Depends}, openjdk-7-jre | openjdk-6-jre (>= 6b23~pre10~), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: openjdk-6-jre (<< 6b18-1.8.7-3), openjdk-6-jre-headless (<< 6b18-1.8.7-3)
 Replaces: openjdk-6-jre (<< 6b18-1.8.7-3), openjdk-6-jre-headless (<< 6b18-1.8.7-3)
 Description: NetX - implementation of the Java Network Launching Protocol (JNLP)
@@ -38,7 +39,7 @@
 Package: icedtea-plugin
 Section: web
 Architecture: all
-Depends: icedtea-6-plugin, ${misc:Depends}
+Depends: icedtea-7-plugin, ${misc:Depends}
 Description: web browser plugin to execute Java applets (dependency package)
  IcedTeaPlugin is a web browser plugin to execute Java applets, supporting
  LiveConnect/JavaScript. It is targeted for xulrunner-1.9 and compatible

=== modified file 'debian/control.in'
--- debian/control.in	2012-03-03 12:30:45 +0000
+++ debian/control.in	2012-07-11 10:11:44 +0000
@@ -1,9 +1,10 @@
 Source: icedtea-web
 Section: java
 Priority: extra
-Maintainer: OpenJDK Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: OpenJDK Team <[e-mail]>
 Uploaders: Matthias Klose <[e-mail]>, Damien Raude-Morvan <[e-mail]>
-Build-Depends: debhelper (>= 5), @bd_plugin@ openjdk-6-jdk (>= 6b23~pre10~), zip, lsb-release, libgtk2.0-dev, pkg-config, default-jre-headless
+Build-Depends: debhelper (>= 5), @bd_plugin@ openjdk-7-jdk, zip, lsb-release, libgtk2.0-dev, pkg-config, default-jre-headless
 Standards-Version: 3.9.3
 Homepage: http://icedtea.classpath.org/wiki/IcedTea-Web
 Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/icedtea-web
@@ -12,7 +13,7 @@
 Package: icedtea-netx
 Architecture: any
 Multi-Arch: same
-Depends: ${netx:Depends}, openjdk-6-jre (>= 6b23~pre10~) | openjdk-7-jre, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${netx:Depends}, openjdk-7-jre | openjdk-6-jre (>= 6b23~pre10~), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: openjdk-6-jre (<< 6b18-1.8.7-3), openjdk-6-jre-headless (<< 6b18-1.8.7-3)
 Replaces: openjdk-6-jre (<< 6b18-1.8.7-3), openjdk-6-jre-headless (<< 6b18-1.8.7-3)
 Description: NetX - implementation of the Java Network Launching Protocol (JNLP)
@@ -38,7 +39,7 @@
 Package: icedtea-plugin
 Section: web
 Architecture: all
-Depends: icedtea-6-plugin, ${misc:Depends}
+Depends: icedtea-7-plugin, ${misc:Depends}
 Description: web browser plugin to execute Java applets (dependency package)
  IcedTeaPlugin is a web browser plugin to execute Java applets, supporting
  LiveConnect/JavaScript. It is targeted for xulrunner-1.9 and compatible

=== modified file 'debian/rules'
--- debian/rules	2012-04-09 16:15:17 +0000
+++ debian/rules	2012-07-11 10:11:44 +0000
@@ -58,9 +58,7 @@
 shortver = 6
 last_npp_version = 6b18~pre2-2
 priority = 1061
-# not yet higher than for 6
 priority7 = 1071
-priority7 = 1060
 plugin_name = IcedTeaPlugin.so
 
 ifneq (,$(filter $(DEB_HOST_ARCH), alpha hppa sparc64)$(filter $(distrel), dapper))
@@ -197,14 +195,14 @@
 	rm -rf build
 	mkdir -p build
 	cd build \
-	  && ../configure $(CONFIGURE_ARGS) --with-jdk-home=/$(jdk_home)
+	  && ../configure $(CONFIGURE_ARGS) --with-jdk-home=/$(jdk7_home)
 	touch $@
 configure7-stamp:
 	dh_testdir
 	rm -rf build7
 	mkdir -p build7
 	cd build7 \
-	  && ../configure $(CONFIGURE_ARGS) --with-jdk-home=/$(jdk_home)
+	  && ../configure $(CONFIGURE_ARGS) --with-jdk-home=/$(jdk7_home)
 	touch $@
 
 build-arch: build-stamp
@@ -323,7 +321,7 @@
 		$(d_comm)/usr/share/applications/
 	cp -p debian/itweb-settings.desktop \
 		$(d_comm)/usr/share/applications/
-	for i in /usr/share/icons/hicolor/*/apps/openjdk-6.png; do \
+	for i in /usr/share/icons/hicolor/*/apps/openjdk-7.png; do \
 	  d=$$(dirname $$i); \
 	  mkdir -p $(d_comm)/$$d; \
 	  cp -p $$i $(d_comm)/$$d/javaws.png; \
@@ -345,7 +343,7 @@
 		$(d_netx)/usr/share/applications/
 	cp -p debian/itweb-settings.desktop \
 		$(d_netx)/usr/share/applications/
-	for i in /usr/share/icons/hicolor/*/apps/openjdk-6.png; do \
+	for i in /usr/share/icons/hicolor/*/apps/openjdk-7.png; do \
 	  d=$$(dirname $$i); \
 	  mkdir -p $(d_netx)/$$d; \
 	  cp -p $$i $(d_netx)/$$d/javaws.png; \