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

[Torsten Werner]

Author: twerner
Date: 2010-07-28 12:48:48 +0000 (Wed, 28 Jul 2010)
New Revision: 12832

Modified:
   trunk/sun-java6/debian/changelog
   trunk/sun-java6/debian/control
   trunk/sun-java6/debian/rules
Log:
Add midori as an alternative to $(browsers) in debian/rules.
(Closes: #588663)

Modified: trunk/sun-java6/debian/changelog
===================================================================
--- trunk/sun-java6/debian/changelog	2010-07-28 12:33:48 UTC (rev 12831)
+++ trunk/sun-java6/debian/changelog	2010-07-28 12:48:48 UTC (rev 12832)
@@ -7,8 +7,10 @@
   * Update danish debconf translation; thanks to Joe Dalton. (Closes: #586238)
   * Update japanese debconf translation; thanks to Hideki Yamane.
     (Closes: #580157)
+  * Add midori as an alternative to $(browsers) in debian/rules.
+    (Closes: #588663)
 
- -- Torsten Werner <twerner at debian.org>  Wed, 28 Jul 2010 14:32:49 +0200
+ -- Torsten Werner <twerner at debian.org>  Wed, 28 Jul 2010 14:47:10 +0200
 
 sun-java6 (6.20-dlj-4) unstable; urgency=low
 

Modified: trunk/sun-java6/debian/control
===================================================================
--- trunk/sun-java6/debian/control	2010-07-28 12:33:48 UTC (rev 12831)
+++ trunk/sun-java6/debian/control	2010-07-28 12:48:48 UTC (rev 12832)
@@ -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 | chromium-browser
+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 | midori
 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 
@@ -89,7 +89,7 @@
 Architecture: amd64 ia64
 Section: non-free/web
 Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, ia32-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
+Depends: ${shlibs:Depends}, ${misc:Depends}, ia32-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 | midori
 Description: The Java(TM) Plug-in, Java SE 6 (32-bit)
  Java Plug-in enables applets written to the Java Platform 6 
  specification to be run in Mozilla and other web browsers. 

Modified: trunk/sun-java6/debian/rules
===================================================================
--- trunk/sun-java6/debian/rules	2010-07-28 12:33:48 UTC (rev 12831)
+++ trunk/sun-java6/debian/rules	2010-07-28 12:48:48 UTC (rev 12832)
@@ -60,7 +60,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 | chromium-browser
+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 | midori
 
 # FIXME: xulrunner-addons only tested on sid, jaunty, karmic
 ifeq ($(distribution),Ubuntu)