diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | src/nspr.mk.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 32554aa..03b8ddf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,8 +22,8 @@ mozilla-devscripts (0.06) UNRELEASED; urgency=low instead of just gecko trunk - update src/mozclient.mk.in + Update nspr project file to generate a version containing the gecko - version, such as 4.7.1~beta~1.9b5~cvs20080310t1054 or - 4.7.1~beta2~1.9b5~cvs20080314t1505 + version, such as 4.7.1~beta+1.9b5~cvs20080310t1054 or + 4.7.1~beta2+1.9b5~cvs20080314t1505 - update src/nspr.mk.in + Fail when MOZCLIENT_GETDATE was not able to find the date on bonsai - update src/mozclient.mk.in diff --git a/src/nspr.mk.in b/src/nspr.mk.in index f2fcd11..438b64a 100644 --- a/src/nspr.mk.in +++ b/src/nspr.mk.in @@ -22,7 +22,7 @@ MOZCLIENT_APPNAME := nspr MOZCLIENT_PROJECT := $(NULL) MOZCLIENT_MODULES := mozilla/nsprpub mozilla/config/milestone.txt MOZCLIENT_FILE := mozilla/nsprpub/pr/include/prinit.h -MOZCLIENT_GETVERSION := ( grep -E '^\#define PR_VERSION' mozilla/nsprpub/pr/include/prinit.h | cut -d\" -f2 | tr 'A-Z' 'a-z' | sed -e 's/beta /beta/' -e 's/ */~/g' -e 's/$$/~/' ; tail -1 mozilla/config/milestone.txt | sed -e 's/pre//') | tr -d '\n' +MOZCLIENT_GETVERSION := ( grep -E '^\#define PR_VERSION' mozilla/nsprpub/pr/include/prinit.h | cut -d\" -f2 | tr 'A-Z' 'a-z' | sed -e 's/beta /beta/' -e 's/ */~/g' -e 's/$$/+/' ; tail -1 mozilla/config/milestone.txt | sed -e 's/pre//') | tr -d '\n' MOZCLIENT_URL := 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=all&branch=HEAD&branchtype=match&dir=mozilla%2Fnsprpub&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=explicit&mindate=1177522884&maxdate=1588258884&cvsroot=%2Fcvsroot' MOZCLIENT_GETDATE = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 $(MOZCLIENT_URL) 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/ /t/' MOZCLIENT_WANTMOZDIR := 1 |