sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by George Sherwood (5ea1594997430a551d79a8129305434fbff23a37)
- From: George Sherwood <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (5ea1594997430a551d79a8129305434fbff23a37)
- Date: Tue, 22 Mar 2011 20:02:53 -0500
GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:
http/firefox/DETAILS | 2 +-
http/firefox/HISTORY | 4 ++++
http/firefox/INSTALL | 17 ++++++-----------
3 files changed, 11 insertions(+), 12 deletions(-)
New commits:
commit 5ea1594997430a551d79a8129305434fbff23a37
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
firefox: Updated devel to 4.0. Will start to work on updating
xulrunner and firefox stable.
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index e89892a..9c3ee61 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=4.0rc1
+ VERSION=4.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 0d6cb96..c2e33b2 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2011-03-22 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to version 4.0
+ * INSTALL: Removed hacks for 4.0rc1
+
2011-03-10 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated devel to version 4.0rc1
* INSTALL: Installing to 4.0 directory vice 4.0rc1 ($VERSION)
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index fad78fc..5364ea7 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -8,11 +8,9 @@ fi &&
make -f client.mk install &&
-if [[ "$FIREFOX_CVS" == "y" ]]; then
- ln -s $INSTALL_ROOT/usr/lib/firefox-4.0 $INSTALL_ROOT/usr/lib/firefox
-else
- ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox
-fi
+
+ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox
+
#
# Script to set MOZILLA_FIVE_HOME
@@ -46,11 +44,8 @@ if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
fi
fi &&
-if [[ "$FIREFOX_CVS" == "y" ]]; then
- ln -vs "$INSTALL_ROOT/usr/lib/xulrunner/plugins" \
- "$INSTALL_ROOT/usr/lib/$SPELL-4.0/plugins"
-else
- ln -vs "$INSTALL_ROOT/usr/lib/xulrunner/plugins" \
+
+ln -vs "$INSTALL_ROOT/usr/lib/xulrunner/plugins" \
"$INSTALL_ROOT/usr/lib/$SPELL-$VERSION/plugins"
-fi
+
- [SM-Commit] GIT changes to master grimoire by George Sherwood (5ea1594997430a551d79a8129305434fbff23a37), George Sherwood, 03/22/2011
Archive powered by MHonArc 2.6.24.