openjdk team mailing list archive

[Jon Severinsson <jon@xxxxxxxxxxxxxxx>]

Hi

When I recently updated the icedtea-web package for the next Tanglu release 
(which will not include openjdk-6, and ships firefox not iceweasel) I couldn't 
stop myself from doing some only tangentally related cleanup. :-P

Please consider applying the attached patch, which adds Tanglu support; 
simplifies debian/rules a bit; only builds icedtea-6-plugin when backported to 
wheezy, trusty, aequorea or earlier; and builds using iceweasel-dev rather 
than xulrunner-dev on recent Debian versions (while using firefox-dev on Ubuntu 
and Tanglu).

Best regards
Jon Severinsson

diff -Nru icedtea-web-1.5/debian/rules icedtea-web-1.5/debian/rules
--- icedtea-web-1.5/debian/rules	2014-04-02 18:16:02.000000000 +0200
+++ icedtea-web-1.5/debian/rules	2014-06-24 09:06:16.000000000 +0200
@@ -26,12 +26,6 @@
     multiarch_dir =
   endif
 endif
-jre_versions = 6
-# for simplicity build the plugin for 7 for multiarch setup only,
-# anything else requires backports.
-ifneq (,$(DEB_HOST_MULTIARCH))
-  jre_versions += 7
-endif
 
 ifneq (,$(wildcard /usr/bin/dpkg-buildflags))
   buildflags := \
@@ -47,22 +41,29 @@
 archdir	  := $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
 			   $(filter $(DEB_HOST_ARCH)=%, $(archdir_map))))
 
-ifneq (,$(filter $(distrel),hardy intrepid jaunty karmic lucid maverick natty oneiric precise lenny etch squeeze))
-  is7_default = no
+ifneq (,$(filter $(distrel),lucid maverick natty oneiric precise squeeze))
+  jre_versions = 6
+  ifneq (,$(DEB_HOST_MULTIARCH))
+    jre_versions += 7
+  endif
   default_version = 6
   default_plugin_version = 6
-else
-  is7_default = yes
+else ifneq (,$(filter $(distrel),quantal raring saucy trusty aequorea wheezy))
+  jre_versions = 6 7
   default_version = 7
   ifneq (,$(filter $(distrel), wheezy))
     default_plugin_version = 6
   else
     default_plugin_version = 7
   endif
+else
+  jre_versions = 7
+  default_version = 7
+  default_plugin_version = 7
 endif
 
 # dependency package for older releases
-ifeq (,$(filter $(distrel),hardy intrepid jaunty karmic lucid maverick natty oneiric precise quantal raring lenny etch squeeze wheezy))
+ifeq (,$(filter $(distrel),lucid maverick natty oneiric precise quantal raring squeeze wheezy))
   nopkgs = -Nicedtea6-plugin
 endif
 
@@ -84,7 +85,7 @@
 last_npp_version = 6b18~pre2-2
 priority = 1061
 # not yet higher than for 6
-priority7 = $(if $(filter yes, $(is7_default)),1071,1060)
+priority7 = $(if $(filter 7, $(default_version)),1071,1060)
 plugin_name = IcedTeaPlugin.so
 
 ifneq (,$(filter $(DEB_HOST_ARCH), alpha hppa sparc64)$(filter $(distrel), dapper))
@@ -95,34 +96,29 @@
   with_plugin_pkg = yes
 endif
 
-ifeq ($(distribution),Debian)
-  ifneq (,$(filter $(distrel),lenny))
-    bd_plugin = xulrunner-dev (>= 1.9.0),
-  else
-    bd_plugin = xulrunner-dev (>= 1.9.1.3-3) [!alpha !sparc64],
-    #xulrunner_depends = xulrunner-1.9.1
-  endif
-else
-  ifneq (,$(filter $(distrel),gutsy feisty edgy dapper))
-    bd_plugin = firefox-dev,
-  else ifneq (,$(filter $(distrel),intrepid))
-    bd_plugin = xulrunner-1.9-dev,
-  else ifneq (,$(filter $(distrel),hardy jaunty))
-    # all these use the xulrunner-1.9.2 backports in *-security
-    bd_plugin = xulrunner-1.9.2-dev [!sparc],
-    xulrunner_depends = xulrunner-1.9.2
-  else ifneq (,$(filter $(distrel),karmic lucid maverick))
+ifeq ($(distribution),Ubuntu)
+  ifneq (,$(filter $(distrel),lucid maverick))
     # all these use the xulrunner-1.9.2 backports in *-security
     bd_plugin = xulrunner-1.9.2-dev,
     xulrunner_depends = xulrunner-1.9.2
   else
     bd_plugin = firefox-dev,
     xulrunner_depends = firefox (>= 4.0~b7) | chromium-browser | epiphany-browser | midori
+  endif
+else ifeq ($(distribution),Tanglu)
+  bd_plugin = firefox-dev,
+  xulrunner_depends = firefox | chromium-browser | www-browser
+else
+  ifneq (,$(filter $(distrel),squeeze wheezy))
+    bd_plugin = xulrunner-dev,
+    #xulrunner_depends = xulrunner-24
+  else
+    bd_plugin = iceweasel-dev,
+    xulrunner_depends = iceweasel | chromium-browser | www-browser
   endif
 endif
 
-
-ifeq ($(is7_default),yes)
+ifeq (7,$(default_version))
   bd_openjdk = openjdk-7-jdk,
   jdk_default_home = $(jdk7_home)
 else
@@ -153,11 +149,6 @@
 
 java_launcher = /$(basedir)/bin/java
 java7_launcher = /$(base7dir)/bin/java
-ifeq ($(distribution),Ubuntu)
-  ifeq (,$(filter $(distrel),karmic jaunty intrepid hardy gutsy feisty edgy dapper))
-    java_launcher = cautious-launcher %f /$(basedir)/bin/java
-  endif
-endif
 
 control_vars = \
 	'-Vxulrunner:Depends=$(xulrunner_depends)' \

Attachment: signature.asc
Description: This is a digitally signed message part.