[24179] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r23780 - in trunk/athena/lib/firefox-extension: debian defaults/preferences

daemon@ATHENA.MIT.EDU (Robert A Basch)
Wed May 13 19:48:20 2009

Date: Wed, 13 May 2009 19:48:08 -0400
From: Robert A Basch <rbasch@MIT.EDU>
Message-Id: <200905132348.n4DNm89b032443@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: rbasch
Date: 2009-05-13 19:48:07 -0400 (Wed, 13 May 2009)
New Revision: 23780

Added:
   trunk/athena/lib/firefox-extension/debian/transform_ubufox.js.debathena
Modified:
   trunk/athena/lib/firefox-extension/debian/changelog
   trunk/athena/lib/firefox-extension/debian/control.in
   trunk/athena/lib/firefox-extension/debian/rules
   trunk/athena/lib/firefox-extension/defaults/preferences/athena.js
Log:
In firefox-extension:
  * Override the ubufox homepage setting (Trac #143).
  * Remove setting of font.mathfont-family preference.


Modified: trunk/athena/lib/firefox-extension/debian/changelog
===================================================================
--- trunk/athena/lib/firefox-extension/debian/changelog	2009-05-13 23:27:39 UTC (rev 23779)
+++ trunk/athena/lib/firefox-extension/debian/changelog	2009-05-13 23:48:07 UTC (rev 23780)
@@ -1,3 +1,10 @@
+debathena-firefox-extension (10.0.2-0debathena1) unstable; urgency=low
+
+  * Override the ubufox homepage setting (Trac #143).
+  * Remove setting of font.mathfont-family preference.
+
+ -- Robert Basch <rbasch@mit.edu>  Wed, 13 May 2009 15:59:22 -0400
+
 debathena-firefox-extension (10.0.1-0debathena3) unstable; urgency=low
 
   * Change DEB_AUTO_UPDATE_AUTOCONF to 2.50, not 1.

Modified: trunk/athena/lib/firefox-extension/debian/control.in
===================================================================
--- trunk/athena/lib/firefox-extension/debian/control.in	2009-05-13 23:27:39 UTC (rev 23779)
+++ trunk/athena/lib/firefox-extension/debian/control.in	2009-05-13 23:48:07 UTC (rev 23780)
@@ -2,12 +2,14 @@
 Section: debathena/web
 Priority: extra
 Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: @cdbs@, zip
+Build-Depends: @cdbs@, zip, debathena-maybe-ubufox
 Standards-Version: 3.7.2
 
 Package: debathena-firefox-extension
 Architecture: all
 Depends: ${misc:Depends}, firefox | iceweasel, libkrb53, psutils
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Athena customizations to the Mozilla Firefox Web browser
  This package provides an extension which customizes the stock version
  of the Firefox browser for the Athena environment.

Modified: trunk/athena/lib/firefox-extension/debian/rules
===================================================================
--- trunk/athena/lib/firefox-extension/debian/rules	2009-05-13 23:27:39 UTC (rev 23779)
+++ trunk/athena/lib/firefox-extension/debian/rules	2009-05-13 23:48:07 UTC (rev 23780)
@@ -1,8 +1,15 @@
 #!/usr/bin/make -f
 
+DEB_DIVERT_EXTENSION = .debathena
+ifneq ($(wildcard /etc/firefox-3.0/pref/ubufox.js),)
+    DEB_TRANSFORM_FILES_debathena-firefox-extension += \
+	/etc/firefox-3.0/pref/ubufox.js.debathena
+endif
+
 DEB_AUTO_UPDATE_AUTOCONF = 2.50
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/config-package.mk
 
 clean::
 	rm -f configure

Added: trunk/athena/lib/firefox-extension/debian/transform_ubufox.js.debathena
===================================================================
--- trunk/athena/lib/firefox-extension/debian/transform_ubufox.js.debathena	2009-05-13 23:27:39 UTC (rev 23779)
+++ trunk/athena/lib/firefox-extension/debian/transform_ubufox.js.debathena	2009-05-13 23:48:07 UTC (rev 23780)
@@ -0,0 +1,3 @@
+#!/bin/sed -f
+$a\
+pref("browser.startup.homepage", "chrome://athena/content/athena.properties");


Property changes on: trunk/athena/lib/firefox-extension/debian/transform_ubufox.js.debathena
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/athena/lib/firefox-extension/defaults/preferences/athena.js
===================================================================
--- trunk/athena/lib/firefox-extension/defaults/preferences/athena.js	2009-05-13 23:27:39 UTC (rev 23779)
+++ trunk/athena/lib/firefox-extension/defaults/preferences/athena.js	2009-05-13 23:48:07 UTC (rev 23780)
@@ -19,9 +19,6 @@
 pref("print.printer_PostScript/2upduplex.print_command", "psnup -q -n 2 | lpr -Zduplex ");
 pref("print.printer_list", "default duplex 2upduplex");
 
-// Font set-up for MathML
-pref("font.mathfont-family", "CMSY10, CMEX10, Math1, Math2, Math4, MT Extra, Standard Symbols L");
-
 // Trust the MIT IdP for HTTP/SPNEGO.
 pref("network.negotiate-auth.trusted-uris", "https://idp.mit.edu");
 


home help back first fref pref prev next nref lref last post