From 38deffc75cb6d60492cefddb4139781d735a66a0 Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Tue, 5 Aug 2008 10:54:42 -0400 Subject: [PATCH] "Brad Lassey" - Bug 445918 - Setting xr version in deb package to gre version + buildid, relanding after backout in de1e95ba7165 r=ted --- xulrunner/installer/Makefile.in | 14 +++++++++++++- xulrunner/installer/debian/changelog.in | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in index 3613cbf7654..64a1463a4b4 100644 --- a/xulrunner/installer/Makefile.in +++ b/xulrunner/installer/Makefile.in @@ -130,12 +130,24 @@ install:: $(pkg_config_files) GARBAGE += $(MOZILLA_VERSION).system.conf $(pkg_config_files) +GARBAGE += debian/changelog DEBDESTDIR=debian/$(MOZ_BUILD_APP) +GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone) +GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID) +MOZ_DEB_TIMESTAMP = "$(shell date +"%a, %d %b %Y %T %z" )" + +DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID) -DMOZ_DEB_TIMESTAMP=$(MOZ_DEB_TIMESTAMP) + ifeq ($(OS_TARGET),Linux) -deb: +debian/changelog: $(srcdir)/debian/changelog.in + mkdir -p debian + $(PYTHON) $(topsrcdir)/config/Preprocessor.py \ + $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $^ > $@ + +deb: debian/changelog $(NSINSTALL) $(topsrcdir)/$(MOZ_BUILD_APP)/installer/debian . rm -rf $(DEBDESTDIR)/usr/local/* $(NSINSTALL) -D $(DEBDESTDIR)/usr/local diff --git a/xulrunner/installer/debian/changelog.in b/xulrunner/installer/debian/changelog.in index ebc9eae8814..afc5f956cec 100644 --- a/xulrunner/installer/debian/changelog.in +++ b/xulrunner/installer/debian/changelog.in @@ -1,4 +1,5 @@ -xulrunner (@MOZ_APP_VERSION@) unstable; urgency=low +#filter substitution +xulrunner (@GRE_MILESTONE@-@GRE_BUILDID@) unstable; urgency=low * Mozilla Nightly (Closes: #nnnn)