[24264] in Source-Commits
/svn/athena r23862 - trunk/debathena/config/email-icon-config/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Wed Jun 17 13:09:43 2009
Date: Wed, 17 Jun 2009 13:09:29 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200906171709.n5HH9Txm020253@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-06-17 13:09:29 -0400 (Wed, 17 Jun 2009)
New Revision: 23862
Modified:
trunk/debathena/config/email-icon-config/debian/changelog
trunk/debathena/config/email-icon-config/debian/control.in
trunk/debathena/config/email-icon-config/debian/debathena-email-switch
Log:
In email-icon-config:
* Since the alternatives for sensible-browser are messed up on Ubuntu,
prefer Firefox over Iceweasel over sensible-browser when opening OWA.
Modified: trunk/debathena/config/email-icon-config/debian/changelog
===================================================================
--- trunk/debathena/config/email-icon-config/debian/changelog 2009-06-17 07:53:17 UTC (rev 23861)
+++ trunk/debathena/config/email-icon-config/debian/changelog 2009-06-17 17:09:29 UTC (rev 23862)
@@ -1,3 +1,10 @@
+debathena-email-icon-config (1.2) unstable; urgency=low
+
+ * Since the alternatives for sensible-browser are messed up on Ubuntu,
+ prefer Firefox over Iceweasel over sensible-browser when opening OWA.
+
+ -- Evan Broder <broder@mit.edu> Wed, 17 Jun 2009 13:06:45 -0400
+
debathena-email-icon-config (1.1) unstable; urgency=low
* Make package suitable for machines that have local users; namely, only
Modified: trunk/debathena/config/email-icon-config/debian/control.in
===================================================================
--- trunk/debathena/config/email-icon-config/debian/control.in 2009-06-17 07:53:17 UTC (rev 23861)
+++ trunk/debathena/config/email-icon-config/debian/control.in 2009-06-17 17:09:29 UTC (rev 23862)
@@ -7,7 +7,7 @@
Package: debathena-email-icon-config
Architecture: all
-Depends: ${misc:Depends}, sensible-utils | debianutils (>= 2.0), hesiod
+Depends: ${misc:Depends}, firefox | iceweasel | sensible-utils | debianutils (>= 2.0), hesiod
Description: Email icon configuration for Debathena graphical logins
Since Outlook Web Access provides a vastly better user experience than
Evolution for Exchange users, this package configures the Evolution
Modified: trunk/debathena/config/email-icon-config/debian/debathena-email-switch
===================================================================
--- trunk/debathena/config/email-icon-config/debian/debathena-email-switch 2009-06-17 07:53:17 UTC (rev 23861)
+++ trunk/debathena/config/email-icon-config/debian/debathena-email-switch 2009-06-17 17:09:29 UTC (rev 23862)
@@ -1,7 +1,14 @@
#!/bin/sh
if [ "$DEBATHENA_HOME_TYPE" = "afs" ] && hesinfo "$USER" pobox | egrep -q "^POP (IMAP\.)?EXCHANGE\.MIT\.EDU "; then
- exec sensible-browser http://owa.mit.edu/
+ if hash firefox >/dev/null 2>&1; then
+ browser=firefox
+ elif hash iceweasel >/dev/null 2>&1; then
+ browser=iceweasel
+ else
+ browser=sensible-browser
+ fi
+ exec "$browser" http://owa.mit.edu/
else
- exec evolution --component=mail
+ exec evolution --component=mail
fi
