Bug 543359 - Adjust Lightning version and required Thunderbird version for mozilla-1.9.2/mozilla-central [r=philipp]

calendar/confvars.sh

@@ -56,7 +56,19 @@ NECKO_COOKIES=
 MOZ_NO_XPCOM_OBSOLETE=1
 MOZ_EXTENSIONS_DEFAULT=
 MOZ_UNIVERSALCHARDET=
-MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/sunbird/config/version.txt`
+
+# Needed for the mozilla-central build side of the system.
+# Can be dropped when we branch MOZILLA_1_9_2_BRANCH
+MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\.[0-9]\).*/\1/;'`
+
+if test "$MOZILLA_BRANCH_VERSION" = "1.9.2"; then
+  MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/sunbird/config/version-192.txt
+else
+  MOZ_APP_VERSION_TXT=$topsrcdir/$MOZ_BUILD_APP/sunbird/config/version.txt
+fi
+
+MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
+
 SUNBIRD_VERSION=$MOZ_APP_VERSION
 
 # Until we can build with libxul, we can't have ipc either

calendar/lightning/Makefile.in

@@ -53,10 +53,11 @@ XPI_PKGNAME = lightning
 STRIP_XPI = 1
 DIST_FILES = install.rdf
 PREF_JS_EXPORTS = $(srcdir)/content/lightning.js
-LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version.txt)
 ifdef MOZILLA_1_9_2_BRANCH
+LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version-192.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
 else
+LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 endif
 ifdef MOZILLA_1_9_1_BRANCH

calendar/lightning/install.rdf

@@ -11,7 +11,11 @@
       <Description>
         <!-- thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+#ifdef MOZILLA_1_9_2_BRANCH
         <em:minVersion>3.1a1pre</em:minVersion>
+#else
+        <em:minVersion>3.2a1pre</em:minVersion>
+#endif
         <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
@@ -49,7 +53,7 @@
     <em:creator>Mozilla Calendar Project</em:creator>
     <em:homepageURL>http://www.mozilla.org/projects/calendar/releases/lightning@LIGHTNING_VERSION@.html</em:homepageURL>
 #ifdef MOZ_LANGPACK_CREATOR
-	  <em:translator>@MOZ_LANGPACK_CREATOR@</em:translator>
+    <em:translator>@MOZ_LANGPACK_CREATOR@</em:translator>
 #endif
 #ifdef MOZ_LANGPACK_CONTRIBUTORS
     @MOZ_LANGPACK_CONTRIBUTORS@

calendar/providers/gdata/Makefile.in

@@ -49,10 +49,11 @@ DIST_FILES = install.rdf
 XPI_PKGNAME = gdata-provider
 STRIP_XPI = 1
 
-CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 ifdef MOZILLA_1_9_2_BRANCH
+CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version-192.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
 else
+CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 endif
 ifdef MOZILLA_1_9_1_BRANCH

calendar/sunbird/config/version-192.txt

@@ -0,0 +1 @@
+1.0b2pre

calendar/timezones/Makefile.in

@@ -77,8 +77,10 @@ INSTALL_EXTENSION_ID = calendar-timezones@mozilla.org
 endif
 
 ifdef MOZILLA_1_9_2_BRANCH
+CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version-192.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-192.txt)
 else
+CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 endif
 ifdef MOZILLA_1_9_1_BRANCH
@@ -86,7 +88,6 @@ SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version-191.txt)
 else
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 endif
-CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
 TIMEZONES_VERSION := $(shell cat $(srcdir)/config/version.txt)
 
 DEFINES += -DAB_CD=$(AB_CD) \

calendar/timezones/install.rdf

@@ -50,7 +50,7 @@
         <!-- Sunbird; we define an upper limit, because we come
              with a top-notch calendar-timezones.xpi on every release -->
         <em:id>{718e30fb-e89b-41dd-9da7-e25a45638b28}</em:id>
-        <em:minVersion>1.1a1pre</em:minVersion>
+        <em:minVersion>0.9</em:minVersion>
         <em:maxVersion>@CALENDAR_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
@@ -58,7 +58,7 @@
       <Description>
         <!-- Thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>3.1a1pre</em:minVersion>
+        <em:minVersion>2.0</em:minVersion>
         <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
@@ -66,7 +66,7 @@
       <Description>
         <!-- Seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.1a1pre</em:minVersion>
+        <em:minVersion>2.0</em:minVersion>
         <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
        </Description>
      </em:targetApplication>