diff -u icedtea-gcjwebplugin-1.0/debian/changelog icedtea-gcjwebplugin-1.0/debian/changelog --- icedtea-gcjwebplugin-1.0/debian/changelog +++ icedtea-gcjwebplugin-1.0/debian/changelog @@ -1,3 +1,10 @@ +icedtea-gcjwebplugin (1.0-0ubuntu6) hardy-proposed; urgency=low + + * Register for browsers based on firefox2. LP: #211309. + * Depend on xulrunner-1.9. + + -- Matthias Klose Thu, 15 May 2008 12:02:43 +0200 + icedtea-gcjwebplugin (1.0-0ubuntu5) hardy; urgency=low * Build icedtea-java7-jre, icedtea-java7-jdk transitional packages. diff -u icedtea-gcjwebplugin-1.0/debian/control icedtea-gcjwebplugin-1.0/debian/control --- icedtea-gcjwebplugin-1.0/debian/control +++ icedtea-gcjwebplugin-1.0/debian/control @@ -7,7 +7,7 @@ Package: icedtea-gcjwebplugin Architecture: any -Depends: openjdk-6-jre (>= 6b06), ${shlibs:Depends}, ${misc:Depends} +Depends: openjdk-6-jre (>= 6b06), xulrunner-1.9, ${shlibs:Depends}, ${misc:Depends} Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a, aa5ca914-c309-495d-91cf-3141bbb04115 Xb-Npp-Name: The GCJ Web Browser Plugin (using OpenJDK) 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_00, 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_00 diff -u icedtea-gcjwebplugin-1.0/debian/rules icedtea-gcjwebplugin-1.0/debian/rules --- icedtea-gcjwebplugin-1.0/debian/rules +++ icedtea-gcjwebplugin-1.0/debian/rules @@ -16,6 +16,7 @@ distrel := $(shell lsb_release --codename --short) xuldev = \ $(if $(filter $(distribution),Debian),libxul-dev,$(if $(filter $(distrel),hardy),xulrunner-1.9-dev,firefox-dev)) +xullib = xulrunner-1.9 TOP = usr/lib/jvm basedir = usr/lib/jvm/$(jdirname) @@ -27,16 +28,13 @@ jdiralias = java-$(shortver)-$(origin) basedir = usr/lib/jvm/$(jdiralias) -ifneq (,$(findstring xulrunner-1.9, $(xuldev))) - browser_plugin_dirs = xulrunner-addons -else - browser_plugin_dirs = firefox iceape iceweasel mozilla midbrowser xulrunner -endif +browser_plugin_dirs = xulrunner-addons firefox iceape iceweasel mozilla midbrowser xulrunner debian/control: debian/control.in debian/rules @cp -p debian/control debian/control.old sed \ -e 's/@xuldev@/$(xuldev)/g' \ + -e 's/@xullib@/$(xullib)/g' \ debian/control.in > debian/control @if cmp -s debian/control debian/control.old; then \ rm -f debian/control.old; \ diff -u icedtea-gcjwebplugin-1.0/debian/control.in icedtea-gcjwebplugin-1.0/debian/control.in --- icedtea-gcjwebplugin-1.0/debian/control.in +++ icedtea-gcjwebplugin-1.0/debian/control.in @@ -7,7 +7,7 @@ Package: icedtea-gcjwebplugin Architecture: any -Depends: openjdk-6-jre (>= 6b06), ${shlibs:Depends}, ${misc:Depends} +Depends: openjdk-6-jre (>= 6b06), @xullib@, ${shlibs:Depends}, ${misc:Depends} Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a, aa5ca914-c309-495d-91cf-3141bbb04115 Xb-Npp-Name: The GCJ Web Browser Plugin (using OpenJDK) 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_00, 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_00