Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-repo.patch
changeset 410 0af1b0003b9f
parent 382 67f876aafae8
child 419 f6b055dd94bc 
--- a/mozilla-repo.patch	Thu Mar 15 10:33:22 2012 +0100
+++ b/mozilla-repo.patch	Fri Mar 16 07:48:35 2012 +0100
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent e315e5900fa90c2183edccd211fbe1e81cdb4c5f
+# Parent 8ea0f829916d7d9dc54567813367bcdfe6cee179
 
 diff --git a/build/Makefile.in b/build/Makefile.in
 --- a/build/Makefile.in
 +++ b/build/Makefile.in
-@@ -86,17 +86,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_
+@@ -91,17 +91,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_
  APP_INI_DEPS += $(DEPTH)/config/autoconf.mk
  
  MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
@@ -48,7 +48,7 @@
 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
 --- a/toolkit/mozapps/installer/package-name.mk
 +++ b/toolkit/mozapps/installer/package-name.mk
-@@ -156,20 +156,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
+@@ -161,20 +161,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
  TEST_PACKAGE = $(PKG_BASENAME).tests.zip
  
  ifneq (,$(wildcard $(DIST)/bin/application.ini))
@@ -67,14 +67,14 @@
 -MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
 +#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
  
- MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt
+ MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt
  
  # JavaScript Shell
  PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in
-@@ -235,17 +235,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
+@@ -236,17 +236,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
  endif
  endif
mozilla