Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (8c7946259caff7ba3d2ae5b315627ab203bf8dc3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (8c7946259caff7ba3d2ae5b315627ab203bf8dc3)
  • Date: Fri, 11 Mar 2011 20:16:23 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

http/firefox/DETAILS | 2 +-
http/firefox/HISTORY | 4 ++++
http/firefox/INSTALL | 13 ++++++++++---
3 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 8c7946259caff7ba3d2ae5b315627ab203bf8dc3
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

firefox: Updated devel to version 4.0rc1

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index d189c17..e89892a 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=4.0b12
+ VERSION=4.0rc1
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 4554fed..0d6cb96 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+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)
+
2011-03-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.15

diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index d643e42..fad78fc 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -8,8 +8,11 @@ fi &&

make -f client.mk install &&

-
-ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox &&
+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

#
# Script to set MOZILLA_FIVE_HOME
@@ -43,7 +46,11 @@ 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" \
"$INSTALL_ROOT/usr/lib/$SPELL-$VERSION/plugins"
-
+fi




  • [SM-Commit] GIT changes to master grimoire by George Sherwood (8c7946259caff7ba3d2ae5b315627ab203bf8dc3), George Sherwood, 03/11/2011

Archive powered by MHonArc 2.6.24.

Top of Page