Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 14:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix nightly deb versions. 1.1 -> 1.1 ; 1.1a2 -> 1.1~a2 ; 1.1a2pre -> 1.1~a2~pre . removes pesky datetime string and hack deb_name.txt. this will break nightly updates one time. bug 542349, r=mfinkle

Browse Source
This commit is contained in:
Aki Sasaki 2010-02-17 11:40:37 -08:00
parent 57fbf48bd4
commit ab9dc28ff7
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/installer/Makefile.in
View File

@ -51,12 +51,7 @@ BASE64_ICON = dist/branding/fennec_maemo_icon26.txt
MOZ_DEB_TIMESTAMP = "$(shell date +"%a, %d %b %Y %T %z" )" MOZ_DEB_TIMESTAMP = "$(shell date +"%a, %d %b %Y %T %z" )"
MOZ_APP_BUILDID = "$(shell date +"%Y%m%d%H%M%S" )" MOZ_APP_BUILDID = "$(shell date +"%Y%m%d%H%M%S" )"
ifdef MOZ_OFFICIAL_BRANDING DEB_PKG_VERSION = $(shell echo $(MOZ_APP_VERSION) | $(PERL) -pe 's/pre/~pre/; s/^([0-9.]+)([a-z][0-9]+)/$$1~$$2/')
DEB_PKG_VERSION = $(MOZ_APP_VERSION)
else
# strip any "pre" part out of the version for deb
DEB_PKG_VERSION = $(shell echo $(MOZ_APP_VERSION) | $(PERL) -pe 's/pre//')~$(MOZ_APP_BUILDID)
endif
DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH) DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
# package name should match mobile/installer/debian/changelog.in # package name should match mobile/installer/debian/changelog.in
@ -198,7 +193,6 @@ deb: $(PP_DEB_FILES) $(DIST)/branding/$(MOZ_APP_NAME)_scalable.png \
$(NSINSTALL) -D $(DEBDESTDIR)$(regdir) $(NSINSTALL) -D $(DEBDESTDIR)$(regdir)
$(SYSINSTALL) $(MOZILLA_VERSION).$(MOZ_APP_NAME).conf $(DEBDESTDIR)$(regdir)/ $(SYSINSTALL) $(MOZILLA_VERSION).$(MOZ_APP_NAME).conf $(DEBDESTDIR)$(regdir)/
dh_link; fakeroot dh_fixperms; fakeroot dh_installdeb; dh_shlibdeps; fakeroot dh_gencontrol; fakeroot dh_md5sums; dh_builddeb dh_link; fakeroot dh_fixperms; fakeroot dh_installdeb; dh_shlibdeps; fakeroot dh_gencontrol; fakeroot dh_md5sums; dh_builddeb
@echo $(DEB_PKG_NAME) > $(DIST)/deb_name.txt
installer: deb installer: deb
@echo Installer DEB created! @echo Installer DEB created!