diff -Nru lightning-extension-1.1~b1+build2/calendar/base/content/widgets/minimonth.xml lightning-extension-1.1+build1/calendar/base/content/widgets/minimonth.xml
--- lightning-extension-1.1~b1+build2/calendar/base/content/widgets/minimonth.xml	2011-12-02 13:29:07.000000000 +0000
+++ lightning-extension-1.1+build1/calendar/base/content/widgets/minimonth.xml	2011-12-19 22:46:52.000000000 +0000
@@ -267,9 +267,9 @@
            if (yearPopup) {
                let monthList = yearPopup.getElementsByAttribute("class", "minimonth-list");
                if (monthList && monthList.length > 0) {
-                   if (event.detail == NSUIEvent.SCROLL_PAGE_UP) {
+                   if (event.detail == UIEvent.SCROLL_PAGE_UP) {
                      this.moveYears('up', monthList.length);
-                   } else if (event.detail == NSUIEvent.SCROLL_PAGE_DOWN) {
+                   } else if (event.detail == UIEvent.SCROLL_PAGE_DOWN) {
                      this.moveYears('down', monthList.length);
                    } else if (event.detail < 0) {
                      this.moveYears('up', 1);
@@ -1167,9 +1167,9 @@
             return;
           }
           var rows = event.detail;
-          if (rows == NSUIEvent.SCROLL_PAGE_UP) {
+          if (rows == UIEvent.SCROLL_PAGE_UP) {
             rows = -1;
-          } else if (rows == NSUIEvent.SCROLL_PAGE_DOWN) {
+          } else if (rows == UIEvent.SCROLL_PAGE_DOWN) {
             rows = 1;
           } else {
             // In this case event.detail contains the default number of lines
diff -Nru lightning-extension-1.1~b1+build2/calendar/lightning/lightning-symbols.mk lightning-extension-1.1+build1/calendar/lightning/lightning-symbols.mk
--- lightning-extension-1.1~b1+build2/calendar/lightning/lightning-symbols.mk	2011-12-02 13:29:07.000000000 +0000
+++ lightning-extension-1.1+build1/calendar/lightning/lightning-symbols.mk	2011-12-19 22:46:52.000000000 +0000
@@ -14,9 +14,9 @@
 ifdef PDBSTR_PATH
 MAKE_SYM_STORE_ARGS += -i
 endif
-DUMP_SYMS_BIN ?= $(topsrcdir)/toolkit/crashreporter/tools/win32/dump_syms_vc$(_MSC_VER).exe
+DUMP_SYMS_BIN ?= $(MOZILLA_SRCDIR)/toolkit/crashreporter/tools/win32/dump_syms_vc$(_MSC_VER).exe
 # PDB files don't get moved to dist, so we need to scan the whole objdir
-MAKE_SYM_STORE_PATH := .
+MAKE_SYM_STORE_PATH := $(DEPTH)
 endif
 ifeq ($(OS_ARCH),Darwin)
 # need to pass arch flags for universal builds
@@ -56,9 +56,9 @@
 	echo packing symbols
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 	cd $(DIST)/crashreporter-symbols && \
-          zip -r9D "../$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip" .
+	  zip -r9D "../$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip" .
 	cd $(DIST)/crashreporter-symbols && \
-	grep "sym" $(SYMBOL_INDEX_NAME) > $(SYMBOL_INDEX_NAME).tmp && \
+	  grep "sym" $(SYMBOL_INDEX_NAME) > $(SYMBOL_INDEX_NAME).tmp && \
 	  mv $(SYMBOL_INDEX_NAME).tmp $(SYMBOL_INDEX_NAME)
 	cd $(DIST)/crashreporter-symbols && \
           zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym" -i "*.txt"
diff -Nru lightning-extension-1.1~b1+build2/calendar/locales/shipped-locales lightning-extension-1.1+build1/calendar/locales/shipped-locales
--- lightning-extension-1.1~b1+build2/calendar/locales/shipped-locales	2011-12-02 13:29:12.000000000 +0000
+++ lightning-extension-1.1+build1/calendar/locales/shipped-locales	2011-12-19 22:46:52.000000000 +0000
@@ -7,6 +7,7 @@
 es-AR
 es-ES
 et
+eu
 fi
 fr
 fy-NL
@@ -19,6 +20,7 @@
 it
 ja linux win32
 ja-JP-mac osx
+ko
 lt
 nb-NO
 nl
diff -Nru lightning-extension-1.1~b1+build2/calendar/resources/content/datetimepickers/datetimepickers.xml lightning-extension-1.1+build1/calendar/resources/content/datetimepickers/datetimepickers.xml
--- lightning-extension-1.1~b1+build2/calendar/resources/content/datetimepickers/datetimepickers.xml	2011-12-02 13:29:07.000000000 +0000
+++ lightning-extension-1.1+build1/calendar/resources/content/datetimepickers/datetimepickers.xml	2011-12-19 22:46:52.000000000 +0000
@@ -605,9 +605,9 @@
       <handler event="DOMMouseScroll">
         <![CDATA[
           var rows = event.detail;
-          if (rows == NSUIEvent.SCROLL_PAGE_UP) {
+          if (rows == UIEvent.SCROLL_PAGE_UP) {
             rows = -1;
-          } else if (rows == NSUIEvent.SCROLL_PAGE_DOWN) {
+          } else if (rows == UIEvent.SCROLL_PAGE_DOWN) {
             rows = 1;
           } else { 
             // In this case event.detail contains the default number of lines
@@ -635,9 +635,9 @@
       <handler event="DOMMouseScroll">
         <![CDATA[
           var rows = event.detail;
-          if (rows == NSUIEvent.SCROLL_PAGE_UP) {
+          if (rows == UIEvent.SCROLL_PAGE_UP) {
             rows = -1;
-          } else if (rows == NSUIEvent.SCROLL_PAGE_DOWN) {
+          } else if (rows == UIEvent.SCROLL_PAGE_DOWN) {
             rows = 1;
           } else { 
             // In this case event.detail contains the default number of lines
diff -Nru lightning-extension-1.1~b1+build2/calendar/sunbird/config/version.txt lightning-extension-1.1+build1/calendar/sunbird/config/version.txt
--- lightning-extension-1.1~b1+build2/calendar/sunbird/config/version.txt	2011-12-02 13:29:12.000000000 +0000
+++ lightning-extension-1.1+build1/calendar/sunbird/config/version.txt	2011-12-19 22:46:56.000000000 +0000
@@ -1 +1 @@
-1.1b1
+1.1
diff -Nru lightning-extension-1.1~b1+build2/debian/changelog lightning-extension-1.1+build1/debian/changelog
--- lightning-extension-1.1~b1+build2/debian/changelog	2011-12-02 14:01:47.000000000 +0000
+++ lightning-extension-1.1+build1/debian/changelog	2011-12-19 23:39:39.000000000 +0000
@@ -1,16 +1,14 @@
-lightning-extension (1.1~b1+build2-0ubuntu0.11.04.1~mtn1) natty; urgency=low
+lightning-extension (1.1+build1-0ubuntu0.11.04.1~mtn1) natty; urgency=low
 
-  * New upstream release from the beta channel (CALENDAR_1_1b1_BUILD2)
+  * New upstream stable release (CALENDAR_1_1_BUILD1)
 
   * Refresh debian/patches/02_fix_system_libxul_build.patch
   * Add debian/patches/03_maxversion_override.patch to ensure compatibility
     with Thunderbird 9 point releases
-  * Switch to comm-beta
-    - update debian/rules
   * Add the new python IDL parser to the tarball
     - update debian/rules
 
- -- Chris Coulson <chris.coulson@canonical.com>  Fri, 02 Dec 2011 14:01:27 +0000
+ -- Chris Coulson <chris.coulson@canonical.com>  Mon, 19 Dec 2011 23:39:17 +0000
 
 lightning-extension (1.0+build1-0ubuntu0.11.04.1~mtn2) natty; urgency=low
 
diff -Nru lightning-extension-1.1~b1+build2/debian/rules lightning-extension-1.1+build1/debian/rules
--- lightning-extension-1.1~b1+build2/debian/rules	2011-12-02 14:01:47.000000000 +0000
+++ lightning-extension-1.1+build1/debian/rules	2011-12-19 23:39:39.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-COMM_REPO	:=	http://hg.mozilla.org/releases/comm-beta
+COMM_REPO	:=	http://hg.mozilla.org/releases/comm-release
 XUL_SDK_DIR	:=	$(shell ls -d /usr/lib/thunderbird-devel-* | tail -n 1)
 XPI_STAGE	:=	mozilla/dist/xpi-stage
 XPI_FILES = \
diff -Nru lightning-extension-1.1~b1+build2/mozilla/build/automation.py.in lightning-extension-1.1+build1/mozilla/build/automation.py.in
--- lightning-extension-1.1~b1+build2/mozilla/build/automation.py.in	2011-12-02 13:40:28.000000000 +0000
+++ lightning-extension-1.1+build1/mozilla/build/automation.py.in	2011-12-19 23:01:45.000000000 +0000
@@ -368,7 +368,7 @@
 user_pref("app.update.enabled", false);
 user_pref("browser.panorama.experienced_first_run", true); // Assume experienced
 user_pref("dom.w3c_touch_events.enabled", true);
-user_pref("toolkit.telemetry.prompted", true);
+user_pref("toolkit.telemetry.prompted", 2);
 
 // Only load extensions from the application and user profile
 // AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
Binary files /tmp/sVTbGVouE3/lightning-extension-1.1~b1+build2/mozilla/build/pgo/certs/cert8.db and /tmp/1yo501vGYD/lightning-extension-1.1+build1/mozilla/build/pgo/certs/cert8.db differ
Binary files /tmp/sVTbGVouE3/lightning-extension-1.1~b1+build2/mozilla/build/pgo/certs/key3.db and /tmp/1yo501vGYD/lightning-extension-1.1+build1/mozilla/build/pgo/certs/key3.db differ
diff -Nru lightning-extension-1.1~b1+build2/mozilla/build/pgo/genpgocert.py.in lightning-extension-1.1+build1/mozilla/build/pgo/genpgocert.py.in
--- lightning-extension-1.1~b1+build2/mozilla/build/pgo/genpgocert.py.in	2011-12-02 13:40:28.000000000 +0000
+++ lightning-extension-1.1+build1/mozilla/build/pgo/genpgocert.py.in	2011-12-19 23:01:45.000000000 +0000
@@ -187,7 +187,7 @@
     runUtil(certutil, ["-D", "-n", "pgo server certificate", "-d", srcDir, "-z", rndfilePath, "-f", pwfilePath])
     # Ignore the result, the certificate may not be present when new database is being built
     
-    status = runUtil(certutil, ["-S", "-s", "CN=%s" % firstLocation, "-t", "Pu,,", "-c", "pgo temporary ca", "-m", "2", "-8", locationsParam, "-v", "12", "-n", "pgo server certificate", "-d", srcDir, "-z", rndfilePath, "-f", pwfilePath])
+    status = runUtil(certutil, ["-S", "-s", "CN=%s" % firstLocation, "-t", "Pu,,", "-c", "pgo temporary ca", "-m", "2", "-8", locationsParam, "-v", "120", "-n", "pgo server certificate", "-d", srcDir, "-z", rndfilePath, "-f", pwfilePath])
     if status != 0:
       return status