summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Tassin <fta@sofaraway.org>2007-09-20 23:30:45 +0000
committerFabien Tassin <fta@sofaraway.org>2007-09-20 23:30:45 +0000
commit1cc550277eee4ff7d7ae512e8be5a58525a9f58e (patch)
tree9bd9414d2ae7f2ff499bbf3f4d409c00fea6dedc
parenta8af84400628d8d1149372f6a11823d7423179a9 (diff)
* Match both alpha and beta firefox/xulrunner pre releases
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 714f15e..495acf3 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@ $(DEBIAN_FF3_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_FF3_FILE)
URL=$(DEBIAN_FF3_URL) ; \
if [ "$(DEBIAN_DATE)" != "" ] ; then DEBIAN_FF3_DATE=$(DEBIAN_DATE) ; else DEBIAN_FF3_DATE=`$(GET)` ; fi ; \
DEBIAN_FF3_CO_DATE="`echo $$DEBIAN_FF3_DATE | sed -e 's/[rt]/ /'`" ; \
- DEBIAN_FF3_VERSION="`cat $(DEBIAN_FF3_FILE) | sed -e 's/a\([0-9]*\)pre/~a\1/'`~cvs$$DEBIAN_FF3_DATE" ; \
+ DEBIAN_FF3_VERSION="`cat $(DEBIAN_FF3_FILE) | sed -e 's/\([ab]\)\([0-9]*\)pre/~\1\2/'`~cvs$$DEBIAN_FF3_DATE" ; \
make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=xulbrowser MOZ_CO_DATE="$$DEBIAN_FF3_CO_DATE" && \
rm -rf $(DEBIAN_FF3_APPNAME)-$$DEBIAN_FF3_VERSION $(DEBIAN_FF3_APPNAME)_$$DEBIAN_FF3_VERSION.orig.tar.gz && \
mkdir $(DEBIAN_FF3_APPNAME)-$$DEBIAN_FF3_VERSION && \
@@ -103,7 +103,7 @@ $(DEBIAN_XUL_TARGET): $(MOZ_CLIENT) $(STAMP) $(DEBIAN_XUL_FILE)
URL=$(DEBIAN_XUL_URL) ; \
if [ "$(DEBIAN_DATE)" != "" ] ; then DEBIAN_XUL_DATE=$(DEBIAN_DATE) ; else DEBIAN_XUL_DATE=`$(GET)` ; fi ; \
DEBIAN_XUL_CO_DATE="`echo $$DEBIAN_XUL_DATE | sed -e 's/[rt]/ /'`" ; \
- DEBIAN_XUL_VERSION="`tail -1 $(DEBIAN_XUL_FILE) | sed -e 's/\(a[0-9]*\)pre/~\1/'`~cvs$$DEBIAN_XUL_DATE" ; \
+ DEBIAN_XUL_VERSION="`tail -1 $(DEBIAN_XUL_FILE) | sed -e 's/\([ab]\)\([0-9]*\)pre/~\1\2/'`~cvs$$DEBIAN_XUL_DATE" ; \
make -f $(MOZ_CLIENT) checkout MOZ_CO_PROJECT=xulrunner MOZ_CO_DATE="$$DEBIAN_XUL_CO_DATE" && \
mkdir $(DEBIAN_XUL_APPNAME)-$$DEBIAN_XUL_VERSION && \
mv mozilla $(DEBIAN_XUL_APPNAME)-$$DEBIAN_XUL_VERSION && \