Skip to Content.
Sympa Menu

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

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 (9fe1da0baa486b9046c8e5589b409cbd4fdb519f)
  • Date: Tue, 16 Jun 2009 21:39:38 -0500

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

http/firefox/DETAILS | 2 +-
http/firefox/HISTORY | 5 +++++
http/firefox/INSTALL | 14 ++++++++++++--
3 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 9fe1da0baa486b9046c8e5589b409cbd4fdb519f
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

firefox: Updated devel to version 3.5rc1. Required hack for
version used in install. Will removed upon release of 3.5

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 78653b9..8befe48 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=3.5b99
+ VERSION=3.5rc1
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 cf1deed..edc38a4 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2009-06-16 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to 3.5rc1
+ * INSTALL: Hack due to install directory being unique
+ in rc. Will fix after 3.5 is released.
+
2009-06-11 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to 3.0.11. SECURITY_PATCH++

diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 21cdb44..9591a55 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -8,7 +8,12 @@ fi &&

make install &&

-ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox &&
+if [[ "$FIREFOX_CVS" == "n" ]]; then
+ ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox
+else
+ ln -s $INSTALL_ROOT/usr/lib/firefox-3.5 $INSTALL_ROOT/usr/lib/firefox
+fi &&
+
#
# Script to set MOZILLA_FIVE_HOME
#
@@ -41,5 +46,10 @@ if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
fi
fi &&

-ln -vs "$INSTALL_ROOT/usr/lib/xulrunner/plugins" \
+if [[ "$FIREFOX_CVS" == "n" ]]; then
+ ln -vs "$INSTALL_ROOT/usr/lib/xulrunner/plugins" \
"$INSTALL_ROOT/usr/lib/$SPELL-$VERSION/plugins"
+else
+ ln -vs "$INSTALL_ROOT/usr/lib/xulrunner/plugins" \
+ "$INSTALL_ROOT/usr/lib/$SPELL-3.5/plugins"
+fi
\ No newline at end of file



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (9fe1da0baa486b9046c8e5589b409cbd4fdb519f), George Sherwood, 06/16/2009

Archive powered by MHonArc 2.6.24.

Top of Page