Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.46 grimoire by George Sherwood (55074d9617ae38ce73b1d6e17a4020c27a4a03cc)

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 stable-0.46 grimoire by George Sherwood (55074d9617ae38ce73b1d6e17a4020c27a4a03cc)
  • Date: Fri, 23 Jul 2010 06:02:43 -0500

GIT changes to stable-0.46 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

http/firefox/DETAILS | 10 +++++++---
http/firefox/HISTORY | 4 ++++
2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 55074d9617ae38ce73b1d6e17a4020c27a4a03cc
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

firefox 3.6.7, SECURITY_PATCH=33
(cherry picked from commit 6b7cb26b683fdbebd5b905139b060fdda35a62af)

Conflicts:

http/firefox/DETAILS
http/firefox/HISTORY

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 7e593d1..443665f 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=3.6.6
+ VERSION=3.6.7
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -8,7 +8,7 @@ if [[ $FIREFOX_CVS == y ]]; then
#
SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=3.6.6
+ VERSION=3.6.7
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -17,8 +17,12 @@ else

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=32
+ SECURITY_PATCH=33
fi
+<<<<<<< HEAD
+=======
+ PATCHLEVEL=0
+>>>>>>> 6b7cb26... firefox 3.6.7, SECURITY_PATCH=33
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.mozilla.org/projects/firefox/
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index b38e5eb..762fec8 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2010-07-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.7, SECURITY_PATCH=33
+ * PRE_BUILD, 1000_fix_alignment.patch: removed patch
+
2010-06-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.6




  • [SM-Commit] GIT changes to stable-0.46 grimoire by George Sherwood (55074d9617ae38ce73b1d6e17a4020c27a4a03cc), George Sherwood, 07/23/2010

Archive powered by MHonArc 2.6.24.

Top of Page