[pkg-java] r11983 - trunk/sun-java6/trunk/debian

[Matthias Klose]

Author: doko
Date: 2010-04-01 20:35:32 +0000 (Thu, 01 Apr 2010)
New Revision: 11983

Modified:
   trunk/sun-java6/trunk/debian/JB-java.desktop.in
   trunk/sun-java6/trunk/debian/changelog
   trunk/sun-java6/trunk/debian/control
   trunk/sun-java6/trunk/debian/rules
Log:
  * Recognize chromium-browser as an available browser. LP: #553468.

Ubuntu only:
  * implement an execute bit checker for the Ubuntu Non-Exec Policy
    (LP: #506702):
    - debian/JB-java.desktop.in: update mime handler to use new launcher.


Modified: trunk/sun-java6/trunk/debian/JB-java.desktop.in
===================================================================
--- trunk/sun-java6/trunk/debian/JB-java.desktop.in	2010-04-01 18:24:08 UTC (rev 11982)
+++ trunk/sun-java6/trunk/debian/JB-java.desktop.in	2010-04-01 20:35:32 UTC (rev 11983)
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=@vendor@ Java @RELEASE@ Runtime at ia32txt@
 Comment=@vendor@ Java @RELEASE@ Runtime at ia32txt@
-Exec=/@basedir@/bin/java -jar
+Exec=@java_launcher@ -jar
 Terminal=false
 Type=Application
 Icon=@basename@

Modified: trunk/sun-java6/trunk/debian/changelog
===================================================================
--- trunk/sun-java6/trunk/debian/changelog	2010-04-01 18:24:08 UTC (rev 11982)
+++ trunk/sun-java6/trunk/debian/changelog	2010-04-01 20:35:32 UTC (rev 11983)
@@ -37,6 +37,7 @@
     - 6909597: JPEGImageReader stepX Integer Overflow Vulnerability.
     - 6932480: Crash in CompilerThread/Parser. Unloaded array klass?
     - 6898739: TLS renegotiation issue.
+  * Recognize chromium-browser as an available browser. LP: #553468.
 
  -- Matthias Klose <doko at canonical.com>  Tue, 30 Mar 2010 23:07:56 +0000
 

Modified: trunk/sun-java6/trunk/debian/control
===================================================================
--- trunk/sun-java6/trunk/debian/control	2010-04-01 18:24:08 UTC (rev 11982)
+++ trunk/sun-java6/trunk/debian/control	2010-04-01 20:35:32 UTC (rev 11983)
@@ -57,7 +57,7 @@
 Architecture: amd64 i386 lpia
 Section: non-free/web
 Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, sun-java6-bin (>= ${source:Version}), firefox | firefox-2 | iceweasel | mozilla-firefox | iceape-browser | mozilla-browser | epiphany-gecko | epiphany-webkit | epiphany-browser | galeon | midbrowser | moblin-web-browser | xulrunner | xulrunner-1.9 | konqueror
+Depends: ${shlibs:Depends}, ${misc:Depends}, sun-java6-bin (>= ${source:Version}), firefox | firefox-2 | iceweasel | mozilla-firefox | iceape-browser | mozilla-browser | epiphany-gecko | epiphany-webkit | epiphany-browser | galeon | midbrowser | moblin-web-browser | xulrunner | xulrunner-1.9 | konqueror | chromium-browser
 Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a 
 Xb-Npp-Name: The Java(TM) Plug-in, Java SE 6
 Xb-Npp-MimeType: application/x-java-vm, application/x-java-applet, application/x-java-applet;version=1.1, application/x-java-applet;version=1.1.1, application/x-java-applet;version=1.1.2, application/x-java-applet;version=1.1.3, application/x-java-applet;version=1.2, application/x-java-applet;version=1.2.1, application/x-java-applet;version=1.2.2, application/x-java-applet;version=1.3, application/x-java-applet;version=1.3.1, application/x-java-applet;version=1.4, application/x-java-applet;version=1.4.1, application/x-java-applet;version=1.4.2, application/x-java-applet;version=1.5, application/x-java-applet;version=1.6, application/x-java-applet;jpi-version=1.6.0_07, application/x-java-bean, application/x-java-bean;version=1.1, application/x-java-bean;version=1.1.1, application/x-java-bean;version=1.1.2, application/x-java-bean;version=1.1.3, application/x-java-bean;version=1.2, application/x-java-bean;version=1.2.1, application/x-java-bean;version=1.2.2, application/x-java-bean;version=1.3, application/x-java-bean;version=1.3.1, application/x-java-bean;version=1.4, application/x-java-bean;version=1.4.1, application/x-java-bean;version=1.4.2, application/x-java-bean;version=1.5, application/x-java-bean;version=1.6, application/x-java-bean;jpi-version=1.6.0_07 

Modified: trunk/sun-java6/trunk/debian/rules
===================================================================
--- trunk/sun-java6/trunk/debian/rules	2010-04-01 18:24:08 UTC (rev 11982)
+++ trunk/sun-java6/trunk/debian/rules	2010-04-01 20:35:32 UTC (rev 11983)
@@ -61,7 +61,7 @@
 	$(if $(filter $(distribution),Debian),libxul-dev,$(if $(filter $(distrelease),hardy),xulrunner-1.9-dev,firefox-dev))
 
 browser_plugin_dirs = xulrunner-addons firefox iceape iceweasel mozilla midbrowser xulrunner konqueror
-browsers = firefox | firefox-2 | iceweasel | mozilla-firefox | iceape-browser | mozilla-browser | epiphany-gecko | epiphany-webkit | epiphany-browser | galeon | midbrowser | moblin-web-browser | xulrunner | xulrunner-1.9 | konqueror
+browsers = firefox | firefox-2 | iceweasel | mozilla-firefox | iceape-browser | mozilla-browser | epiphany-gecko | epiphany-webkit | epiphany-browser | galeon | midbrowser | moblin-web-browser | xulrunner | xulrunner-1.9 | konqueror | chromium-browser
 
 # FIXME: xulrunner-addons only tested on sid, jaunty, karmic
 ifeq ($(distribution),Ubuntu)
@@ -71,6 +71,13 @@
   browser_plugin_dirs = xulrunner-addons firefox iceape iceweasel mozilla midbrowser xulrunner
 endif
 
+java_launcher = /$(basedir)/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
+
 with_wgy_zenhai = $(if $(filter $(distrelease),hardy),yes)
 
 cjk_fonts = ttf-baekmuk | ttf-unfonts | ttf-unfonts-core,
@@ -228,6 +235,7 @@
 	      -e 's/@RELEASE@/$(relstring)/g' \
 	      -e 's/@archdir@/$(archdir)/g' \
 	      -e 's/@browsers@/$(browsers)/g' \
+	      -e 's, at java_launcher@,$(java_launcher),g' \
 	      -e 's/@cjk_fonts@/$(cjk_fonts)/g' \
 	      -e 's, at pkg_version@,$(if $(filter $(distrelease),etch dapper edgy feisty gutsy),$${Source-Version},$${source:Version}),g' \
 	    debian/control.in > debian/control