diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | src/mozclient/firefox-3.1.conf | 2 | ||||
| -rw-r--r-- | src/mozclient/xulrunner-1.9.1.conf | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 3146694..d158f9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,10 @@ mozilla-devscripts (0.09) UNRELEASED; urgency=low + Update global clean-up script to remove new .dll/.exe shipped by upstream - update src/mozclient/remove.binonly.sh + + Disable MOZCLIENT_POSTCOCMD for xulrunner-1.9.1 and firefox-3.1 + now that upstream made it obsolete + - udpate src/mozclient/xulrunner-1.9.1.conf + - update src/mozclient/firefox-3.1.conf * [ compare ] + Add build-tree/dist to the list of directories for compare1 diff --git a/src/mozclient/firefox-3.1.conf b/src/mozclient/firefox-3.1.conf index 1a0e487..a6231e5 100644 --- a/src/mozclient/firefox-3.1.conf +++ b/src/mozclient/firefox-3.1.conf @@ -21,7 +21,7 @@ MOZCLIENT_VCS = hg MOZCLIENT_VCS_LOC = http://hg.mozilla.org/ MOZCLIENT_FILE = mozilla/browser/config/version.txt MOZCLIENT_GETVERSION = sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/' mozilla/browser/config/version.txt -MOZCLIENT_POSTCOCMD = cd mozilla && python client.py checkout +#MOZCLIENT_POSTCOCMD = cd mozilla && python client.py checkout MOZCLIENT_GETDATE = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; ' MOZCLIENT_EMBEDDED = 1 MOZCLIENT_WANTMOZDIR = 1 diff --git a/src/mozclient/xulrunner-1.9.1.conf b/src/mozclient/xulrunner-1.9.1.conf index 22bdc65..b986b04 100644 --- a/src/mozclient/xulrunner-1.9.1.conf +++ b/src/mozclient/xulrunner-1.9.1.conf @@ -21,7 +21,7 @@ MOZCLIENT_FILE = mozilla/config/milestone.txt MOZCLIENT_GETVERSION = tail -1 mozilla/config/milestone.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/' MOZCLIENT_VCS = hg MOZCLIENT_VCS_LOC = http://hg.mozilla.org/ -MOZCLIENT_POSTCOCMD = cd mozilla && python client.py checkout +#MOZCLIENT_POSTCOCMD = cd mozilla && python client.py checkout MOZCLIENT_GETDATE = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; ' MOZCLIENT_EMBEDDED = 1 MOZCLIENT_WANTMOZDIR = 1 |