[23120] in Source-Commits
/svn/athena r22784 - in trunk/athena/bin/firefox-wrapper: . debian
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Fri Mar 7 11:14:45 2008
Date: Fri, 7 Mar 2008 11:14:11 -0500 (EST)
From: ghudson@MIT.EDU
Message-Id: <200803071614.LAA15883@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-03-07 11:14:11 -0500 (Fri, 07 Mar 2008)
New Revision: 22784
Removed:
trunk/athena/bin/firefox-wrapper/debian/patches/
Modified:
trunk/athena/bin/firefox-wrapper/Makefile.in
trunk/athena/bin/firefox-wrapper/debian/changelog
trunk/athena/bin/firefox-wrapper/debian/rules
trunk/athena/bin/firefox-wrapper/firefox.sh
Log:
Eliminate the quilt patches for firefox-wrapper.
* athena/bin/firefox-wrapper/Makefile.in: Install as firefox.debathena
and let debathena-divert do the replacement.
* athena/bin/firefox-wrapper/debian/patches: Remove.
* athena/bin/firefox-wrapper/debian/rules: Remove patchsys-quilt
invocation. Remove sed editing of script in the Ubuntu case since
there is conditional logic to determine the library directory in
the script.
* athena/bin/firefox-wrapper/firefox.sh: Remove Solaris support. Set
firefox_libdir to /usr/lib/iceweasel on Debian, /usr/lib/firefox
otherwise. Fix up paths for Athena 10. After frobbing, execute
system wrapper script instead of Firefox binary.
Modified: trunk/athena/bin/firefox-wrapper/Makefile.in
===================================================================
--- trunk/athena/bin/firefox-wrapper/Makefile.in 2008-03-07 15:52:55 UTC (rev 22783)
+++ trunk/athena/bin/firefox-wrapper/Makefile.in 2008-03-07 16:14:11 UTC (rev 22784)
@@ -30,7 +30,7 @@
install:
${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
- ${INSTALL_SCRIPT} firefox.sh ${DESTDIR}${bindir}/firefox
+ ${INSTALL_SCRIPT} firefox.sh ${DESTDIR}${bindir}/firefox.debathena
${INSTALL_PROGRAM} testlock ${DESTDIR}${bindir}
clean:
Modified: trunk/athena/bin/firefox-wrapper/debian/changelog
===================================================================
--- trunk/athena/bin/firefox-wrapper/debian/changelog 2008-03-07 15:52:55 UTC (rev 22783)
+++ trunk/athena/bin/firefox-wrapper/debian/changelog 2008-03-07 16:14:11 UTC (rev 22784)
@@ -1,3 +1,9 @@
+debathena-firefox-wrapper (10.0.0-0debathena1) unstable; urgency=low
+
+ * Patches folded into main source.
+
+ -- Greg Hudson <ghudson@equal-rites.mit.edu> Fri, 07 Mar 2008 11:02:08 -0500
+
debathena-firefox-wrapper (9.4.39+cvs20070623-0debathena1) unstable; urgency=low
* Initial release.
Modified: trunk/athena/bin/firefox-wrapper/debian/rules
===================================================================
--- trunk/athena/bin/firefox-wrapper/debian/rules 2008-03-07 15:52:55 UTC (rev 22783)
+++ trunk/athena/bin/firefox-wrapper/debian/rules 2008-03-07 16:14:11 UTC (rev 22784)
@@ -20,7 +20,6 @@
ifeq ($(LSB_ID), Ubuntu)
fix-iceweasel-path: FORCE
- sed -i 's,/usr/lib/iceweasel,/usr/lib/firefox,' debian/debathena-firefox-wrapper/usr/bin/firefox.debathena
else
$(error Unrecognized distribution ID $(LSB_ID).)
endif
@@ -31,7 +30,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debathena-divert.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
clean::
rm -f configure
Modified: trunk/athena/bin/firefox-wrapper/firefox.sh
===================================================================
--- trunk/athena/bin/firefox-wrapper/firefox.sh 2008-03-07 15:52:55 UTC (rev 22783)
+++ trunk/athena/bin/firefox-wrapper/firefox.sh 2008-03-07 16:14:11 UTC (rev 22784)
@@ -12,34 +12,12 @@
# applications.
lockers="infoagents acro"
-case `uname` in
-SunOS)
- firefox_libdir=/opt/sfw/lib/firefox
- LD_LIBRARY_PATH=/usr/athena/lib
- export LD_LIBRARY_PATH
-
- # On Solaris, use the X server's shared memory transport for better
- # performance.
- if [ -z "$XSUNTRANSPORT" ]; then
- XSUNTRANSPORT=shmem
- XSUNSMESIZE=512
- export XSUNTRANSPORT XSUNSMESIZE
- fi
-
- plugin_path=/usr/java/jre/plugin/sparc/ns7
- plugin_path=$plugin_path:/usr/sfw/lib/mozilla/plugins
- awk=nawk
- ;;
-
-Linux)
+if [ $(lsb_release --short --id) == "Debian" ]; then
+ firefox_libdir=/usr/lib/iceweasel
+else
firefox_libdir=/usr/lib/firefox
+fi
- plugin_path=/usr/java/jdk/jre/plugin/i386/ns7
- plugin_path=$plugin_path:/usr/lib/mozilla/plugins
- awk=awk
- ;;
-esac
-
# mozilla-xremote-client sends a command to a running Mozilla
# application using X properties. Its possible return codes are:
# 0 success
@@ -51,7 +29,7 @@
# testlock is used to test whether the profile directory's lock file
# is actually locked.
-testlock=/usr/athena/bin/testlock
+testlock=/usr/bin/testlock
# Set the plugin path. We allow the user to skip loading our
# standard plugins via the MOZ_PLUGIN_PATH_OVERRIDE variable.
@@ -69,7 +47,7 @@
if [ ! -s "$inifile" ]; then
return 1
fi
- $awk -F= -v parent="$prof_parent" '
+ awk -F= -v parent="$prof_parent" '
BEGIN {
nprofiles = 0;
use_default = 1;
@@ -130,7 +108,7 @@
# Extract the IP address and PID from the contents of the symlink.
# Also note whether firefox used fnctl() to lock .parentlock,
# which is indicated with a leading '+' in the PID.
- eval `ls -l $locklink | $awk '{
+ eval `ls -l $locklink | awk '{
if (split($NF, a, ":") == 2)
printf("lock_ip=%s ; lock_pid=%d ; use_fcntl=%d\n",
a[1], int(a[2]), (substr(a[2], 1, 1) == "+")); }'`
@@ -163,7 +141,7 @@
else
# Handle an old-style (symlink) lock.
my_host=`hostname`
- if [ "$lock_ip" = "`host $my_host | $awk '{ print $NF; }'`" ]; then
+ if [ "$lock_ip" = "`host $my_host | awk '{ print $NF; }'`" ]; then
# Lock is held on this machine.
local=true
fi
@@ -236,7 +214,7 @@
# Attach needed lockers.
for locker in $lockers ; do
- /bin/athena/attach -h -n -q $locker
+ /bin/attach -h -n -q $locker
done
# Configure fontconfig to use fonts for MathML.
@@ -250,7 +228,7 @@
# the ACL appropriately.
if [ ! -d "$prof_parent" ]; then
mkdir -p "$prof_parent"
- /bin/athena/fs setacl "$prof_parent" system:anyuser none system:authuser none
+ /usr/bin/fs setacl "$prof_parent" system:anyuser none system:authuser none
fi
# We want Firefox to download files for helper applications to
@@ -265,7 +243,7 @@
# Firefox, and invoke the program now.
case "$1" in
-*)
- exec $firefox_libdir/firefox "$@"
+ exec /usr/bin/firefox.debathena-orig "$@"
;;
esac
