Bug 538174 - N900: App Manager only picks up xulrunner as an update option going from 12/5 nightly to rc2 [r=blassey a=stuart]
authorStuart Parmenter <stuart@mozilla.com>
Wed, 06 Jan 2010 10:38:02 -0800
changeset 65951 a5c155941126fa91b6ba47a1758eb723ebe8e6d0
parent 65950 9e5dba07574db05c9221babc8ffb9005d547ce3a
child 65952 5edcb77ed8c0df25c5553450d42fada6e3f07ee5
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey, stuart
bugs538174
Bug 538174 - N900: App Manager only picks up xulrunner as an update option going from 12/5 nightly to rc2 [r=blassey a=stuart]
mobile/branding/nightly/configure.sh
mobile/branding/official/configure.sh
mobile/confvars.sh
mobile/installer/Makefile.in
mobile/installer/debian/changelog.in
mobile/installer/debian/control.in
mobile/installer/debian/files.in
--- a/mobile/branding/nightly/configure.sh
+++ b/mobile/branding/nightly/configure.sh
@@ -1,2 +1,11 @@
 MOZ_APP_DISPLAYNAME=Fennec
 MOZ_APP_UA_EXTRA=Namoroka
+
+case "$target" in
+*-wince*)
+    MOZ_APP_VERSION=1.0a4pre
+    ;;
+*)
+    MOZ_APP_VERSION=1.1a1pre
+    ;;
+esac
--- a/mobile/branding/official/configure.sh
+++ b/mobile/branding/official/configure.sh
@@ -1,2 +1,11 @@
 MOZ_APP_DISPLAYNAME=Firefox
 MOZ_APP_UA_EXTRA=Firefox
+
+case "$target" in
+*-wince*)
+    MOZ_APP_VERSION=1.0a4pre
+    ;;
+*)
+    MOZ_APP_VERSION=1.1a1
+    ;;
+esac
--- a/mobile/confvars.sh
+++ b/mobile/confvars.sh
@@ -33,24 +33,17 @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=fennec
 MOZ_BRANDING_DIRECTORY=mobile/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/branding/official
+
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
-
-case "$target" in
-*-wince*)
-    MOZ_APP_VERSION=1.0a4pre
-    ;;
-*)
-    MOZ_APP_VERSION=1.0
-    ;;
-esac
+# MOZ_APP_VERSION is set by branding/configure.sh
 
 MOZ_XUL_APP=1
 MOZ_UPDATER=0
 MOZ_ENABLE_LIBXUL=1
 MOZ_NO_XPCOM_OBSOLETE=1
 MOZ_XULRUNNER=1
--- a/mobile/installer/Makefile.in
+++ b/mobile/installer/Makefile.in
@@ -43,23 +43,25 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 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)
 ABS_OBJDIR=`cd $(DEPTH); pwd`
 BASE64_ICON = dist/branding/fennec_maemo_icon26.txt
 MOZ_DEB_TIMESTAMP = "$(shell date  +"%a, %d  %b %Y %T %z" )"
+MOZ_APP_BUILDID = "$(shell date  +"%Y%m%d%H%M%S" )"
 
 DEFINES += \
 	-DGRE_MILESTONE=$(GRE_MILESTONE) \
 	-DGRE_BUILDID=$(GRE_BUILDID) \
 	-Dinstalldir=$(installdir) \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
+	-DMOZ_APP_BUILDID=$(MOZ_APP_BUILDID) \
 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
 	-DABS_OBJDIR=$(ABS_OBJDIR) \
 	-DBASE64_ICON=$(BASE64_ICON) \
 	-DMOZ_DEB_TIMESTAMP=$(MOZ_DEB_TIMESTAMP) \
 	$(NULL)
 
 NO_PKG_FILES = \
 	$(MOZ_APP_NAME)-config \
--- a/mobile/installer/debian/changelog.in
+++ b/mobile/installer/debian/changelog.in
@@ -1,6 +1,10 @@
 #filter substitution
-fennec (@MOZ_APP_VERSION@)  unstable; urgency=low
+#ifdef MOZ_OFFICIAL_BRANDING
+fennec (@MOZ_APP_VERSION@)  stable; urgency=low
+#else
+fennec (@MOZ_APP_VERSION@~@MOZ_APP_BUILDID@)  unstable; urgency=low
+#endif
 
   * Mozilla Nightly (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 
- -- Mozilla Mobile  <mobile@mozilla.com>  @MOZ_DEB_TIMESTAMP@
+ -- Mobile Feedback <mobile-feedback@mozilla.com>  @MOZ_DEB_TIMESTAMP@
--- a/mobile/installer/debian/control.in
+++ b/mobile/installer/debian/control.in
@@ -1,16 +1,16 @@
 #filter substitution
 Source: fennec
 Section: user/network
 Priority: extra
-Maintainer: Mozilla Mobile <mobile@mozilla.com>
-Build-Depends: debhelper (>= 5)
+Maintainer: Mobile Feedback <mobile-feedback@mozilla.com>
+Build-Depends: debhelper (>= 4)
 Standards-Version: 3.7.2
 
 Package: fennec
 Architecture: any
 Depends: ${shlibs:Depends}, xulrunner (>=@GRE_MILESTONE@-@GRE_BUILDID@)
-Description: Mozilla's mobile browser
- This browser is the full rendering engine of Mozilla Firefox combined with a user interface designed to make browsing the web on a mobile device a rich and uncompromised experience.
+Description: Web browser built by the Mozilla community
+ The Firefox Web browser puts you in control of your Web experience with easy navigation, support for add-ons and synchronizes with Firefox on your PC.
 XB-Maemo-Display-Name: @MOZ_APP_DISPLAYNAME@
 XB-Maemo-Icon-26:
 #includesubst @ABS_OBJDIR@/@BASE64_ICON@
--- a/mobile/installer/debian/files.in
+++ b/mobile/installer/debian/files.in
@@ -1,1 +1,2 @@
-@MOZ_APP_NAME@_@MOZ_APP_VERSION@_armel.deb user/internet extra
+#filter substitution
+@MOZ_APP_NAME@_@MOZ_APP_VERSION@_armel.deb user/network extra