diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/mozclient.mk.in | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 8105848..981d0c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mozilla-devscripts (0.03) UNRELEASED; urgency=low + + * Fix PST date missed for direct checkout + - update src/mozclient.mk.in + + -- Fabien Tassin <fta@sofaraway.org> Wed, 23 Jan 2008 21:15:14 +0100 + mozilla-devscripts (0.02) hardy; urgency=low * Move patches for mozilla/client.mk inside src/ as they were previously diff --git a/src/mozclient.mk.in b/src/mozclient.mk.in index 37340cc..cf61c89 100644 --- a/src/mozclient.mk.in +++ b/src/mozclient.mk.in @@ -85,6 +85,7 @@ MOZCLIENT_EXCLUDE_SCRIPT := ../../remove.binonly.sh NOBINONLY := nobinonly TAR_EXCLUDE := --exclude=CVS --exclude=.cvsignore +DATE_FILTER := sed -e 's,\(....\)\(..\)\(..\)[rt]\(..\)\(..\),\1/\2/\3 \4:\5 PST,' ifdef DEBIAN_TAG DEBIAN_DATE = $(NULL) @@ -95,7 +96,7 @@ DEBIAN_MOZ_CO_TAG = MOZ_CO_TAG=$(DEBIAN_LTAG) else DEBIAN_MOZ_CO_TAG = $(NULL) ifdef DEBIAN_DATE -DEBIAN_CO_DATE = $(shell echo "-D \"$(DEBIAN_DATE)\"" | sed -e 's/[rt]/ /') +DEBIAN_CO_DATE = $(shell echo "-D \"$(DEBIAN_DATE)\"" | $(DATE_FILTER)) endif ifdef DEBIAN_BRANCH DEBIAN_CO_TAG = -r $(DEBIAN_BRANCH) @@ -156,7 +157,7 @@ ifneq (,$(DEBIAN_DATE)) mozclient-checkout: MOZCLIENT_DATE = MOZ_CO_DATE="$(DEBIAN_DATE)" else mozclient-checkout: DEBIAN_DATE = $(shell $(MOZCLIENT_GETDATE)) -mozclient-checkout: MOZCLIENT_DATE = MOZ_CO_DATE="$(shell echo $(DEBIAN_DATE) | sed -e 's,\(....\)\(..\)\(..\)[rt]\(..\)\(..\),\1/\2/\3 \4:\5 PST,')" +mozclient-checkout: MOZCLIENT_DATE = MOZ_CO_DATE="$(shell echo $(DEBIAN_DATE) | $(DATE_FILTER))" endif endif mozclient-checkout: |