[23404] in Source-Commits
/svn/athena r23058 - in trunk/debathena/debathena/firefox-wrapper: . debian
daemon@ATHENA.MIT.EDU (rbasch@MIT.EDU)
Sun Jul 6 14:53:57 2008
Date: Sun, 6 Jul 2008 14:53:23 -0400 (EDT)
From: rbasch@MIT.EDU
Message-Id: <200807061853.OAA24801@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: rbasch
Date: 2008-07-06 14:53:22 -0400 (Sun, 06 Jul 2008)
New Revision: 23058
Modified:
trunk/debathena/debathena/firefox-wrapper/debian/changelog
trunk/debathena/debathena/firefox-wrapper/debian/control
trunk/debathena/debathena/firefox-wrapper/debian/control.in
trunk/debathena/debathena/firefox-wrapper/firefox.sh
Log:
In firefox-wrapper:
* Use firefox's -remote option to ping a running instance, as
the availability and location of mozilla-xremote-client varies
between distributions and versions.
* Use a zenity question dialog instead of a warning, since in
later zenity versions the warning does not include a Cancel
button.
* Redirect fs output to /dev/null.
* Add dependencies on zenity, debathena-attach.
* Remove the dependency on lsb-release.
Modified: trunk/debathena/debathena/firefox-wrapper/debian/changelog
===================================================================
--- trunk/debathena/debathena/firefox-wrapper/debian/changelog 2008-07-03 03:49:38 UTC (rev 23057)
+++ trunk/debathena/debathena/firefox-wrapper/debian/changelog 2008-07-06 18:53:22 UTC (rev 23058)
@@ -1,3 +1,17 @@
+debathena-firefox-wrapper (10.0.4) unstable; urgency=low
+
+ * Use firefox's -remote option to ping a running instance, as
+ the availability and location of mozilla-xremote-client varies
+ between distributions and versions.
+ * Use a zenity question dialog instead of a warning, since in
+ later zenity versions the warning does not include a Cancel
+ button.
+ * Redirect fs output to /dev/null.
+ * Add dependencies on zenity, debathena-attach.
+ * Remove the dependency on lsb-release.
+
+ -- Robert Basch <rbasch@mit.edu> Sun, 06 Jul 2008 13:23:54 -0400
+
debathena-firefox-wrapper (10.0.3) unstable; urgency=low
* Punt Debian version component; we are no longer treating wrapper
Modified: trunk/debathena/debathena/firefox-wrapper/debian/control
===================================================================
--- trunk/debathena/debathena/firefox-wrapper/debian/control 2008-07-03 03:49:38 UTC (rev 23057)
+++ trunk/debathena/debathena/firefox-wrapper/debian/control 2008-07-06 18:53:22 UTC (rev 23058)
@@ -2,12 +2,12 @@
Section: debathena/web
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.2.0), autoconf, config-package-dev (>= 4.5~)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev (>= 4.5~)
Standards-Version: 3.7.2
Package: debathena-firefox-wrapper
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, iceweasel | firefox, lsb-release
+Depends: ${shlibs:Depends}, ${misc:Depends}, iceweasel | firefox, zenity, debathena-attach
Description: Wrapper to configure Mozilla Firefox for Debathena
This package provides a wrapper for the stock Mozilla Firefox web
browser. It handles disposing of stale profile locks, as well as
Modified: trunk/debathena/debathena/firefox-wrapper/debian/control.in
===================================================================
--- trunk/debathena/debathena/firefox-wrapper/debian/control.in 2008-07-03 03:49:38 UTC (rev 23057)
+++ trunk/debathena/debathena/firefox-wrapper/debian/control.in 2008-07-06 18:53:22 UTC (rev 23058)
@@ -7,7 +7,7 @@
Package: debathena-firefox-wrapper
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, iceweasel | firefox, lsb-release
+Depends: ${shlibs:Depends}, ${misc:Depends}, iceweasel | firefox, zenity, debathena-attach
Description: Wrapper to configure Mozilla Firefox for Debathena
This package provides a wrapper for the stock Mozilla Firefox web
browser. It handles disposing of stale profile locks, as well as
Modified: trunk/debathena/debathena/firefox-wrapper/firefox.sh
===================================================================
--- trunk/debathena/debathena/firefox-wrapper/firefox.sh 2008-07-03 03:49:38 UTC (rev 23057)
+++ trunk/debathena/debathena/firefox-wrapper/firefox.sh 2008-07-06 18:53:22 UTC (rev 23058)
@@ -12,21 +12,6 @@
# applications.
lockers="infoagents acro"
-if [ $(lsb_release --short --id) = "Debian" ]; then
- firefox_libdir=/usr/lib/iceweasel
-else
- firefox_libdir=/usr/lib/firefox
-fi
-
-# mozilla-xremote-client sends a command to a running Mozilla
-# application using X properties. Its possible return codes are:
-# 0 success
-# 1 failed to connect to the X server
-# 2 no running window found
-# 3 failed to send command
-# 4 usage error
-moz_remote=$firefox_libdir/mozilla-xremote-client
-
# testlock is used to test whether the profile directory's lock file
# is actually locked.
testlock=/usr/bin/testlock
@@ -184,7 +169,7 @@
without starting Firefox.
"
- zenity --title "Firefox profile locked" --warning --text "$dialog_text"
+ zenity --title "Firefox profile locked" --question --text "$dialog_text"
case $? in
0)
@@ -228,7 +213,8 @@
# the ACL appropriately.
if [ ! -d "$prof_parent" ]; then
mkdir -p "$prof_parent"
- /usr/bin/fs setacl "$prof_parent" system:anyuser none system:authuser none
+ /usr/bin/fs setacl "$prof_parent" system:anyuser none \
+ system:authuser none >/dev/null 2>&1
fi
# We want Firefox to download files for helper applications to
@@ -250,18 +236,18 @@
if [ "${MOZ_NO_REMOTE+set}" = "set" ]; then
found_running=false
else
- # See if there is a running instance of Firefox.
+ # See if there is a running instance of Firefox, by trying to
+ # "ping" it using X properties.
user="${LOGNAME:+-u $LOGNAME}"
- $firefox_libdir/run-mozilla.sh $moz_remote $user -a "$moz_progname" \
+ /usr/bin/firefox.debathena-orig $user -a "$moz_progname" -remote \
"ping()" >/dev/null 2>&1
case $? in
0)
+ # We successfully pinged it.
found_running=true
;;
2)
# This is the expected status when there is no running firefox window.
- # Clear the error condition.
- remote_error=
found_running=false
;;
*)
