Bug 1512882 - Restore building extensions in SeaMonkey. r=IanN a=IanN DONTBUILD SEAMONKEY_2_49_ESR_RELBRANCH
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Mon, 15 Jul 2019 18:08:20 +0200
branchSEAMONKEY_2_49_ESR_RELBRANCH
changeset 28313 3fe8be0e3a645eb17b5e4ac6902677014102706d
parent 28312 32ca9eea4f9bcdc7c0ab7b95c4a3358f6ef8d33a
child 28314 908f70442daa21da7c272ade9cec99204b235437
push id2136
push userfrgrahl@gmx.net
push dateMon, 15 Jul 2019 16:13:42 +0000
treeherdercomm-esr52@6b30146aa411 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, IanN
bugs1512882
Bug 1512882 - Restore building extensions in SeaMonkey. r=IanN a=IanN DONTBUILD SeaMonkey ESR52 release branch only.
calendar/base/jar.mn
calendar/base/moz.build
calendar/lightning/Makefile.in
calendar/lightning/jar.mn
calendar/lightning/moz.build
suite/app.mozbuild
suite/app/Makefile.in
suite/config/mozconfigs/linux32/debug
suite/config/mozconfigs/linux32/l10n-mozconfig
suite/config/mozconfigs/linux32/nightly
suite/config/mozconfigs/linux32/release
suite/config/mozconfigs/linux32/release-l10n
suite/config/mozconfigs/linux64/l10n-mozconfig
suite/config/mozconfigs/linux64/nightly
suite/config/mozconfigs/linux64/release
suite/config/mozconfigs/linux64/release-l10n
suite/config/mozconfigs/macosx-universal/l10n-mozconfig
suite/config/mozconfigs/macosx-universal/nightly
suite/config/mozconfigs/macosx-universal/release
suite/config/mozconfigs/macosx-universal/release-l10n
suite/config/mozconfigs/macosx64/release-l10n
suite/config/mozconfigs/win32/debug
suite/config/mozconfigs/win32/l10n-mozconfig
suite/config/mozconfigs/win32/nightly
suite/config/mozconfigs/win32/release
suite/config/mozconfigs/win32/release-l10n
suite/config/mozconfigs/win64/debug
suite/config/mozconfigs/win64/l10n-mozconfig
suite/config/mozconfigs/win64/nightly
suite/confvars.sh
suite/installer/package-manifest.in
suite/locales/Makefile.in
new file mode 100644
--- /dev/null
+++ b/calendar/base/jar.mn
@@ -0,0 +1,225 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+calendar.jar:
+% resource calendar .
+% content calendar %content/calendar/
+    content/calendar/agenda-listbox.js                     (content/agenda-listbox.js)
+    content/calendar/agenda-listbox.xml                    (content/agenda-listbox.xml)
+    content/calendar/calendar-bindings.css                 (content/calendar-bindings.css)
+    content/calendar/calendar-calendars-list.xul           (content/calendar-calendars-list.xul)
+    content/calendar/calendar-chrome-startup.js            (content/calendar-chrome-startup.js)
+    content/calendar/calendar-clipboard.js                 (content/calendar-clipboard.js)
+*   content/calendar/calendar-common-sets.xul              (content/calendar-common-sets.xul)
+    content/calendar/calendar-common-sets.js               (content/calendar-common-sets.js)
+    content/calendar/calendar-daypicker.xml                (content/calendar-daypicker.xml)
+    content/calendar/calendar-views.xml                    (content/calendar-views.xml)
+*   content/calendar/calendar-dnd-listener.js              (content/calendar-dnd-listener.js)
+    content/calendar/calendar-extract.js                   (content/calendar-extract.js)
+    content/calendar/calendar-invitations-manager.js       (content/calendar-invitations-manager.js)
+    content/calendar/calendar-item-editing.js              (content/calendar-item-editing.js)
+    content/calendar/calendar-item-bindings.xml            (content/calendar-item-bindings.xml)
+    content/calendar/calendar-management.js                (content/calendar-management.js)
+    content/calendar/calendar-menus.xml                    (content/calendar-menus.xml)
+    content/calendar/calendar-views.xul                    (content/calendar-views.xul)
+    content/calendar/calendar-month-view.xml               (content/calendar-month-view.xml)
+    content/calendar/calendar-multiday-view.xml            (content/calendar-multiday-view.xml)
+    content/calendar/calendar-base-view.xml                (content/calendar-base-view.xml)
+    content/calendar/calendar-statusbar.js                 (content/calendar-statusbar.js)
+    content/calendar/calendar-task-editing.js              (content/calendar-task-editing.js)
+    content/calendar/calendar-task-tree.xml                (content/calendar-task-tree.xml)
+    content/calendar/calendar-task-tree.js                 (content/calendar-task-tree.js)
+    content/calendar/calendar-task-view.xul                (content/calendar-task-view.xul)
+    content/calendar/calendar-task-view.js                 (content/calendar-task-view.js)
+    content/calendar/calendar-ui-utils.js                  (content/calendar-ui-utils.js)
+    content/calendar/calendar-unifinder.xul                (content/calendar-unifinder.xul)
+    content/calendar/calendar-unifinder.js                 (content/calendar-unifinder.js)
+    content/calendar/calendar-unifinder-todo.xul           (content/calendar-unifinder-todo.xul)
+    content/calendar/calendar-unifinder-todo.js            (content/calendar-unifinder-todo.js)
+    content/calendar/calendar-view-bindings.css            (content/calendar-view-bindings.css)
+    content/calendar/calendar-view-core.xml                (content/calendar-view-core.xml)
+    content/calendar/calendar-views.js                     (content/calendar-views.js)
+    content/calendar/import-export.js                      (content/import-export.js)
+    content/calendar/today-pane.xul                        (content/today-pane.xul)
+    content/calendar/today-pane.js                         (content/today-pane.js)
+    content/calendar/calendar-alarm-dialog.js              (content/dialogs/calendar-alarm-dialog.js)
+    content/calendar/calendar-alarm-dialog.xul             (content/dialogs/calendar-alarm-dialog.xul)
+    content/calendar/calendar-conflicts-dialog.xul         (content/dialogs/calendar-conflicts-dialog.xul)
+    content/calendar/calendar-creation.js                  (content/dialogs/calendar-creation.js)
+    content/calendar/calendar-dialog-utils.js              (content/dialogs/calendar-dialog-utils.js)
+    content/calendar/calendar-error-prompt.xul             (content/dialogs/calendar-error-prompt.xul)
+    content/calendar/calendar-event-dialog.css             (content/dialogs/calendar-event-dialog.css)
+*   content/calendar/calendar-event-dialog.xul             (content/dialogs/calendar-event-dialog.xul)
+    content/calendar/calendar-event-dialog-attendees.xml   (content/dialogs/calendar-event-dialog-attendees.xml)
+    content/calendar/calendar-event-dialog-freebusy.xml    (content/dialogs/calendar-event-dialog-freebusy.xml)
+    content/calendar/calendar-event-dialog-recurrence.xul  (content/dialogs/calendar-event-dialog-recurrence.xul)
+    content/calendar/calendar-event-dialog-recurrence.js   (content/dialogs/calendar-event-dialog-recurrence.js)
+    content/calendar/calendar-event-dialog-recurrence-preview.xml  (content/dialogs/calendar-event-dialog-recurrence-preview.xml)
+    content/calendar/calendar-event-dialog-reminder.js     (content/dialogs/calendar-event-dialog-reminder.js)
+    content/calendar/calendar-event-dialog-reminder.xul    (content/dialogs/calendar-event-dialog-reminder.xul)
+    content/calendar/calendar-event-dialog-timezone.js     (content/dialogs/calendar-event-dialog-timezone.js)
+    content/calendar/calendar-event-dialog-timezone.xul    (content/dialogs/calendar-event-dialog-timezone.xul)
+    content/calendar/calendar-event-dialog-attendees.xul   (content/dialogs/calendar-event-dialog-attendees.xul)
+    content/calendar/calendar-event-dialog-attendees.js    (content/dialogs/calendar-event-dialog-attendees.js)
+    content/calendar/calendar-invitations-dialog.css       (content/dialogs/calendar-invitations-dialog.css)
+    content/calendar/calendar-invitations-dialog.js        (content/dialogs/calendar-invitations-dialog.js)
+    content/calendar/calendar-invitations-dialog.xul       (content/dialogs/calendar-invitations-dialog.xul)
+    content/calendar/calendar-invitations-list.xml         (content/dialogs/calendar-invitations-list.xml)
+*   content/calendar/calendar-migration-dialog.js          (content/dialogs/calendar-migration-dialog.js)
+    content/calendar/calendar-migration-dialog.xul         (content/dialogs/calendar-migration-dialog.xul)
+    content/calendar/calendar-occurrence-prompt.xul        (content/dialogs/calendar-occurrence-prompt.xul)
+    content/calendar/calendar-print-dialog.js              (content/dialogs/calendar-print-dialog.js)
+    content/calendar/calendar-print-dialog.xul             (content/dialogs/calendar-print-dialog.xul)
+    content/calendar/calendar-properties-dialog.xul        (content/dialogs/calendar-properties-dialog.xul)
+    content/calendar/calendar-properties-dialog.js         (content/dialogs/calendar-properties-dialog.js)
+    content/calendar/calendar-providerUninstall-dialog.xul (content/dialogs/calendar-providerUninstall-dialog.xul)
+    content/calendar/calendar-providerUninstall-dialog.js  (content/dialogs/calendar-providerUninstall-dialog.js)
+    content/calendar/calendar-subscriptions-dialog.css     (content/dialogs/calendar-subscriptions-dialog.css)
+    content/calendar/calendar-subscriptions-dialog.js      (content/dialogs/calendar-subscriptions-dialog.js)
+    content/calendar/calendar-subscriptions-dialog.xul     (content/dialogs/calendar-subscriptions-dialog.xul)
+    content/calendar/calendar-summary-dialog.js            (content/dialogs/calendar-summary-dialog.js)
+    content/calendar/calendar-summary-dialog.xul           (content/dialogs/calendar-summary-dialog.xul)
+    content/calendar/chooseCalendarDialog.xul              (content/dialogs/chooseCalendarDialog.xul)
+    content/calendar/preferences/alarms.xul                (content/preferences/alarms.xul)
+    content/calendar/preferences/alarms.js                 (content/preferences/alarms.js)
+    content/calendar/preferences/categories.xul            (content/preferences/categories.xul)
+    content/calendar/preferences/categories.js             (content/preferences/categories.js)
+    content/calendar/preferences/editCategory.xul          (content/preferences/editCategory.xul)
+    content/calendar/preferences/editCategory.js           (content/preferences/editCategory.js)
+    content/calendar/preferences/general.js                (content/preferences/general.js)
+*   content/calendar/preferences/general.xul               (content/preferences/general.xul)
+    content/calendar/preferences/views.js                  (content/preferences/views.js)
+    content/calendar/preferences/views.xul                 (content/preferences/views.xul)
+    content/calendar/widgets/minimonth.xml                 (content/widgets/minimonth.xml)
+    content/calendar/widgets/calendar-alarm-widget.xml     (content/widgets/calendar-alarm-widget.xml)
+    content/calendar/widgets/calendar-widgets.xml          (content/widgets/calendar-widgets.xml)
+    content/calendar/widgets/calendar-list-tree.xml        (content/widgets/calendar-list-tree.xml)
+    content/calendar/calendar-subscriptions-list.xml       (content/widgets/calendar-subscriptions-list.xml)
+    content/calendar/widgets/calendar-widget-bindings.css  (content/widgets/calendar-widget-bindings.css)
+    content/calendar/calApplicationUtils.js                (src/calApplicationUtils.js)
+    content/calendar/calUtils.js                           (src/calUtils.js)
+    content/calendar/calFilter.js                          (src/calFilter.js)
+    content/calendar/WindowsNTToZoneInfoTZId.properties    (src/WindowsNTToZoneInfoTZId.properties)
+% skin calendar classic/1.0 chrome/skin/linux/calendar/
+% skin calendar classic/1.0 chrome/skin/osx/calendar/ os=Darwin
+% skin calendar classic/1.0 chrome/skin/windows/calendar/ os=WINNT
+% skin calendar-common classic/1.0 chrome/skin/common/
+% style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar-task-view.css
+% style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar-event-dialog.css
+% style chrome://calendar/content/calendar-event-dialog.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css
+% style chrome://lightning/content/lightning-item-iframe.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css
+% style chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css
+    ../skin/common/alarm-flashing.png                 (themes/common/images/alarm-flashing.png)
+    ../skin/common/alarm-icons.png                    (themes/common/images/alarm-icons.png)
+    ../skin/common/attendee-icons.png                 (themes/common/images/attendee-icons.png)
+    ../skin/common/calendar-overlay.png               (themes/common/images/calendar-overlay.png)
+    ../skin/common/calendar-status.png                (themes/common/images/calendar-status.png)
+    ../skin/common/checkbox-images.png                (themes/common/images/checkbox-images.png)
+    ../skin/common/classification.png                 (themes/common/images/classification.png)
+    ../skin/common/day-box-item-image.png             (themes/common/images/day-box-item-image.png)
+    ../skin/common/event-grippy-bottom.png            (themes/common/images/event-grippy-bottom.png)
+    ../skin/common/event-grippy-left.png              (themes/common/images/event-grippy-left.png)
+    ../skin/common/event-grippy-right.png             (themes/common/images/event-grippy-right.png)
+    ../skin/common/event-grippy-top.png               (themes/common/images/event-grippy-top.png)
+    ../skin/common/ok-cancel.png                      (themes/common/images/ok-cancel.png)
+    ../skin/common/task-images.png                    (themes/common/images/task-images.png)
+    ../skin/common/timezone_map.png                   (themes/common/images/timezone_map.png)
+    ../skin/common/timezones.png                      (themes/common/images/timezones.png)
+    ../skin/common/calendar-event-dialog.png          (themes/common/dialogs/images/calendar-event-dialog.png)
+    ../skin/common/calendar-event-tab.png             (themes/common/dialogs/images/calendar-event-tab.png)
+    ../skin/common/calendar-task-tab.png              (themes/common/dialogs/images/calendar-task-tab.png)
+    ../skin/common/widgets/nav-arrow.svg              (themes/common/widgets/images/nav-arrow.svg)
+    ../skin/common/widgets/nav-today.svg              (themes/common/widgets/images/nav-today.svg)
+    ../skin/common/widgets/nav-today-hov.svg          (themes/common/widgets/images/nav-today-hov.svg)
+    ../skin/common/widgets/view-navigation.svg        (themes/common/widgets/images/view-navigation.svg)
+    ../skin/common/widgets/view-navigation-hov.svg    (themes/common/widgets/images/view-navigation-hov.svg)
+    ../skin/common/widgets/drag-center.svg            (themes/common/widgets/images/drag-center.svg)
+    ../skin/common/calendar-alarms.css                (themes/common/calendar-alarms.css)
+    ../skin/common/calendar-attendees.css             (themes/common/calendar-attendees.css)
+    ../skin/common/calendar-creation-wizard.css       (themes/common/calendar-creation-wizard.css)
+    ../skin/common/calendar-daypicker.css             (themes/common/calendar-daypicker.css)
+    ../skin/common/calendar-management.css            (themes/common/calendar-management.css)
+    ../skin/common/calendar-occurrence-prompt.css     (themes/common/calendar-occurrence-prompt.css)
+    ../skin/common/calendar-printing.css              (themes/common/calendar-printing.css)
+    ../skin/common/calendar-providerUninstall-dialog.css (themes/common/calendar-providerUninstall-dialog.css)
+    ../skin/common/calendar-task-tree.css             (themes/common/calendar-task-tree.css)
+    ../skin/common/calendar-task-view.css             (themes/common/calendar-task-view.css)
+    ../skin/common/calendar-toolbar.svg               (themes/common/calendar-toolbar.svg)
+    ../skin/common/calendar-toolbar-osxlion.svg       (themes/common/calendar-toolbar-osxlion.svg)
+    ../skin/common/calendar-itip-icons.svg            (themes/common/calendar-itip-icons.svg)
+    ../skin/common/calendar-unifinder.css             (themes/common/calendar-unifinder.css)
+    ../skin/common/calendar-views.css                 (themes/common/calendar-views.css)
+    ../skin/common/today-pane.css                     (themes/common/today-pane.css)
+    ../skin/common/today-pane-cycler.svg              (themes/common/today-pane-cycler.svg)
+    ../skin/common/dialogs/calendar-alarm-dialog.css  (themes/common/dialogs/calendar-alarm-dialog.css)
+    ../skin/common/dialogs/calendar-event-dialog.css  (themes/common/dialogs/calendar-event-dialog.css)
+    ../skin/common/dialogs/calendar-invitations-dialog.css (themes/common/dialogs/calendar-invitations-dialog.css)
+    ../skin/common/calendar-event-dialog-attendees.png     (themes/common/dialogs/images/calendar-event-dialog-attendees.png)
+    ../skin/common/calendar-invitations-dialog-button-images.png (themes/common/dialogs/images/calendar-invitations-dialog-button-images.png)
+    ../skin/common/calendar-invitations-dialog-list-images.png   (themes/common/dialogs/images/calendar-invitations-dialog-list-images.png)
+    ../skin/common/calendar-properties-dialog.css     (themes/common/dialogs/calendar-properties-dialog.css)
+    ../skin/common/calendar-subscriptions-dialog.css  (themes/common/dialogs/calendar-subscriptions-dialog.css)
+    ../skin/common/calendar-timezone-highlighter.css  (themes/common/dialogs/calendar-timezone-highlighter.css)
+    ../skin/common/widgets/calendar-widgets.css       (themes/common/widgets/calendar-widgets.css)
+    ../skin/common/widgets/minimonth.css              (themes/common/widgets/minimonth.css)
+
+# Linux theme files
+    ../skin/linux/calendar/cal-icon32.png                                 (themes/linux/images/cal-icon32.png)
+    ../skin/linux/calendar/cal-icon24.png                                 (themes/linux/images/cal-icon24.png)
+    ../skin/linux/calendar/calendar-alarm-dialog.css                      (themes/linux/dialogs/calendar-alarm-dialog.css)
+    ../skin/linux/calendar/calendar-daypicker.css                         (themes/linux/calendar-daypicker.css)
+    ../skin/linux/calendar/calendar-event-dialog.css                      (themes/linux/dialogs/calendar-event-dialog.css)
+    ../skin/linux/calendar/calendar-invitations-dialog.css                (themes/linux/dialogs/calendar-invitations-dialog.css)
+    ../skin/linux/calendar/calendar-management.css                        (themes/linux/calendar-management.css)
+    ../skin/linux/calendar/calendar-task-tree.css                         (themes/linux/calendar-task-tree.css)
+    ../skin/linux/calendar/calendar-task-view.css                         (themes/linux/calendar-task-view.css)
+    ../skin/linux/calendar/calendar-unifinder.css                         (themes/linux/calendar-unifinder.css)
+    ../skin/linux/calendar/calendar-views.css                             (themes/linux/calendar-views.css)
+    ../skin/linux/calendar/today-pane.css                                 (themes/linux/today-pane.css)
+    ../skin/linux/calendar/widgets/calendar-widgets.css                   (themes/linux/widgets/calendar-widgets.css)
+    ../skin/linux/calendar/calendar-occurrence-prompt.png                 (themes/linux/images/calendar-occurrence-prompt.png)
+
+# OS X theme files
+    ../skin/osx/calendar/cal-icon32.png                                 (themes/osx/images/cal-icon32.png)
+    ../skin/osx/calendar/cal-icon24.png                                 (themes/osx/images/cal-icon24.png)
+    ../skin/osx/calendar/calendar-alarm-dialog.css                      (themes/osx/dialogs/calendar-alarm-dialog.css)
+    ../skin/osx/calendar/calendar-daypicker.css                         (themes/osx/calendar-daypicker.css)
+    ../skin/osx/calendar/calendar-event-dialog.css                      (themes/osx/dialogs/calendar-event-dialog.css)
+    ../skin/osx/calendar/calendar-invitations-dialog.css                (themes/osx/dialogs/calendar-invitations-dialog.css)
+    ../skin/osx/calendar/calendar-management.css                        (themes/osx/calendar-management.css)
+    ../skin/osx/calendar/calendar-task-tree.css                         (themes/osx/calendar-task-tree.css)
+    ../skin/osx/calendar/calendar-task-view.css                         (themes/osx/calendar-task-view.css)
+    ../skin/osx/calendar/calendar-unifinder.css                         (themes/osx/calendar-unifinder.css)
+    ../skin/osx/calendar/calendar-views.css                             (themes/osx/calendar-views.css)
+    ../skin/osx/calendar/checkbox-images.png                            (themes/osx/images/checkbox-images.png)
+    ../skin/osx/calendar/today-pane.css                                 (themes/osx/today-pane.css)
+    ../skin/osx/calendar/widgets/calendar-widgets.css                   (themes/osx/widgets/calendar-widgets.css)
+    ../skin/osx/calendar/calendar-occurrence-prompt.png                 (themes/osx/images/calendar-occurrence-prompt.png)
+    ../skin/osx/calendar/checkbox-images-graphite.png                   (themes/osx/images/checkbox-images-graphite.png)
+    ../skin/osx/calendar/sidebar-item.png                               (themes/osx/images/sidebar-item.png)
+    ../skin/osx/calendar/spin-buttons.png                               (themes/osx/images/spin-buttons.png)
+    ../skin/osx/calendar/spin-buttons-active.png                        (themes/osx/images/spin-buttons-active.png)
+
+# Windows theme files
+    ../skin/windows/calendar/cal-icon32.png                                 (themes/windows/images/cal-icon32.png)
+    ../skin/windows/calendar/cal-icon24.png                                 (themes/windows/images/cal-icon24.png)
+    ../skin/windows/calendar/calendar-alarm-dialog.css                      (themes/windows/dialogs/calendar-alarm-dialog.css)
+    ../skin/windows/calendar/calendar-daypicker.css                         (themes/windows/calendar-daypicker.css)
+    ../skin/windows/calendar/calendar-event-dialog.css                      (themes/windows/dialogs/calendar-event-dialog.css)
+    ../skin/windows/calendar/calendar-invitations-dialog.css                (themes/windows/dialogs/calendar-invitations-dialog.css)
+    ../skin/windows/calendar/calendar-management.css                        (themes/windows/calendar-management.css)
+    ../skin/windows/calendar/calendar-task-tree.css                         (themes/windows/calendar-task-tree.css)
+    ../skin/windows/calendar/calendar-task-view.css                         (themes/windows/calendar-task-view.css)
+    ../skin/windows/calendar/calendar-unifinder.css                         (themes/windows/calendar-unifinder.css)
+    ../skin/windows/calendar/calendar-views.css                             (themes/windows/calendar-views.css)
+    ../skin/windows/calendar/today-pane.css                                 (themes/windows/today-pane.css)
+    ../skin/windows/calendar/widgets/calendar-widgets.css                   (themes/windows/widgets/calendar-widgets.css)
+    ../skin/windows/calendar/calendar-event-dialog-toolbar.png              (themes/windows/dialogs/images/calendar-event-dialog-toolbar.png)
+    ../skin/windows/calendar/calendar-event-dialog-toolbar-small.png        (themes/windows/dialogs/images/calendar-event-dialog-toolbar-small.png)
+    ../skin/windows/calendar/calendar-occurrence-prompt.png                 (themes/windows/images/calendar-occurrence-prompt.png)
+    ../skin/windows/calendar/tasks-actions.png                              (themes/windows/images/tasks-actions.png)
+    ../skin/windows/calendar/toolbar-large.png                              (themes/windows/images/toolbar-large.png)
+    ../skin/windows/calendar/toolbar-small.png                              (themes/windows/images/toolbar-small.png)
+    ../skin/windows/calendar/calendar-occurrence-prompt-aero.png            (themes/windows/images/calendar-occurrence-prompt-aero.png)
--- a/calendar/base/moz.build
+++ b/calendar/base/moz.build
@@ -2,10 +2,61 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS = [
     'public',
     'backend',
     'src',
+    'modules',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    DEFINES['THEME'] = 'windows'
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    DEFINES['THEME'] = 'osx'
+else:
+    DEFINES['THEME'] = 'linux'
+
+# Window icons are not needed on mac
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
+    icon_path = 'themes/common/icons/'
+    window_icons = [
+        'calendar-alarm-dialog',
+        'calendar-event-dialog',
+        'calendar-event-summary-dialog',
+        'calendar-task-dialog',
+        'calendar-task-summary-dialog',
+    ]
+
+    # Set up the icon suffix to differ between windows and linux
+    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+        icon_suffix = '.ico'
+    else:
+        icon_suffix = '.png'
+
+    FINAL_TARGET_FILES.chrome.icons.default += [
+        '%s%s%s' % (icon_path, icon, icon_suffix) for icon in window_icons
+    ]
+
+with Files('content/**'):
+    BUG_COMPONENT = ('Calendar', 'Calendar Views')
+
+with Files('content/preferences/**'):
+    BUG_COMPONENT = ('Calendar', 'Preferences')
+
+with Files('content/dialogs/**'):
+    BUG_COMPONENT = ('Calendar', 'Dialogs')
+
+with Files('content/*task*'):
+    BUG_COMPONENT = ('Calendar', 'Tasks')
+
+with Files('content/dialogs/*alarm*'):
+    BUG_COMPONENT = ('Calendar', 'Alarms')
+
+with Files('content/widgets/*alarm*'):
+    BUG_COMPONENT = ('Calendar', 'Alarms')
+
+with Files('themes/**'):
+    BUG_COMPONENT = ('Calendar', 'Calendar Views')
new file mode 100644
--- /dev/null
+++ b/calendar/lightning/Makefile.in
@@ -0,0 +1,94 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Calendar builders currently use STRIP_XPI to reduce the binary component in
+# Lightning.
+
+XPI_PKGNAME = lightning-$(LIGHTNING_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
+XPI_VERSION = $(LIGHTNING_VERSION)
+
+XPI_EM_ID = {e2fda1a4-762b-4020-b5ad-a41df1933103}
+
+ifneq (,$(findstring a,$(LIGHTNING_VERSION)))
+DEFINES += -DLIGHTNING_PRERELEASE_VERSION=1
+endif
+
+# Enable nightly updates on aurora and nightly channel
+ifeq (nightly,$(subst aurora,nightly,$(MOZ_UPDATE_CHANNEL)))
+DEFINES += -DLIGHTNING_UPDATE_LOCATION=https://calendar.mozilla.org/update.php
+endif
+
+# Gecko milestone
+GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build Milestone)
+ifdef GRE_MILESTONE
+DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE)
+endif
+
+# comm-central source repo and stamp
+SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node}\n' 2>/dev/null))
+ifdef SOURCE_STAMP
+DEFINES += -DSOURCE_STAMP='$(SOURCE_STAMP)'
+endif
+
+SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e 's/^ssh:/http:/')
+ifdef SOURCE_REPO
+DEFINES += -DSOURCE_REPO='$(SOURCE_REPO)'
+endif
+
+# Mozilla source repo and stamps
+MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_SRCDIR) parent --template='{node}\n' 2>/dev/null))
+ifdef MOZ_SOURCE_STAMP
+DEFINES += -DMOZ_SOURCE_STAMP='$(MOZ_SOURCE_STAMP)'
+endif
+
+MOZ_SOURCE_REPO := $(shell hg -R $(MOZILLA_SRCDIR) showconfig paths.default 2>/dev/null | sed -e 's/^ssh:/http:/')
+ifdef MOZ_SOURCE_REPO
+DEFINES += -DMOZ_SOURCE_REPO='$(MOZ_SOURCE_REPO)'
+endif
+
+ifdef NIGHTLY_BUILD
+# On nightly builds, install as a global extension in
+# dist/bin/extensions/
+XPI_INSTALL_EXTENSION = $(XPI_EM_ID)
+else
+# For beta and release builds, install as a distribution extension in
+# dist/bin/distribution/extensions/
+INSTALL_EXTENSION_ID = $(XPI_EM_ID)
+endif
+
+DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
+           -DTHUNDERBIRD_MAXVERSION=$(THUNDERBIRD_MAXVERSION) \
+           -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
+           -DSEAMONKEY_MAXVERSION=$(SEAMONKEY_MAXVERSION) \
+           -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
+           -DTARGET_PLATFORM=$(OS_TARGET)_$(TARGET_XPCOM_ABI) \
+           -DXPI_EM_ID="$(XPI_EM_ID)" \
+           $(NULL)
+
+MOZ_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
+DEFINES += -DMOZ_BUILDID=$(MOZ_BUILDID)
+
+include $(topsrcdir)/config/rules.mk
+include $(srcdir)/versions.mk
+include $(srcdir)/lightning-packager.mk
+include $(srcdir)/lightning-tests.mk
+
+# For Lightning, we also need to preprocess the l10n prefs. Pull in the en-US
+# copy if the files doesn't exist.
+repack-process-extrafiles: lightning-extrafiles
+lightning-extrafiles: LTN_ABCD_L10NJS=$(call EXPAND_LOCALE_SRCDIR,calendar/locales)/lightning-l10n.js
+lightning-extrafiles: LTN_ANY_L10NJS=$(if $(wildcard $(LTN_ABCD_L10NJS)),$(LTN_ABCD_L10NJS),$(topsrcdir)/calendar/locales/en-US/lightning-l10n.js)
+lightning-extrafiles:
+	$(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(LTN_ANY_L10NJS) -o $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(L10N_XPI_NAME)/$(PREF_DIR)/lightning-l10n.js)
+
+ident:
+	@printf 'comm_revision '
+	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
+	    $(FINAL_TARGET)/app.ini App SourceStamp
+	@printf 'moz_revision '
+	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
+	    $(FINAL_TARGET)/app.ini Build SourceStamp
+	@printf 'buildid '
+	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
+	    $(FINAL_TARGET)/app.ini App BuildID
new file mode 100644
--- /dev/null
+++ b/calendar/lightning/jar.mn
@@ -0,0 +1,123 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+lightning.jar:
+% override chrome://messagebody/skin/imip.css chrome://lightning/skin/imip.css
+% override chrome://messagebody/skin/calendar-event-dialog-attendees.png chrome://calendar-common/skin/calendar-event-dialog-attendees.png
+% overlay chrome://messenger/content/messenger.xul chrome://lightning/content/lightning-migration.xul
+% overlay chrome://messenger/content/messenger.xul chrome://lightning/content/lightning-item-panel.xul
+% overlay chrome://messenger/content/msgAccountCentral.xul chrome://lightning/content/messenger-overlay-accountCentral.xul
+% overlay chrome://messenger/content/messenger.xul chrome://lightning/content/messenger-overlay-sidebar.xul
+% overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/imip-bar-overlay.xul
+% overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/messenger-overlay-messageWindow.xul
+% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/imip-bar-overlay.xul
+% overlay chrome://communicator/content/pref/preferences.xul chrome://lightning/content/suite-overlay-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% overlay about:addons chrome://lightning/content/suite-overlay-addons.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% overlay chrome://mozapps/content/extensions/extensions.xul chrome://lightning/content/suite-overlay-addons.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% overlay chrome://messenger/content/preferences/preferences.xul chrome://lightning/content/messenger-overlay-preferences.xul
+% overlay about:preferences chrome://lightning/content/messenger-overlay-preferences.xul
+% overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/alarms.xul
+% overlay about:preferences chrome://calendar/content/preferences/alarms.xul
+% overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/categories.xul
+% overlay about:preferences chrome://calendar/content/preferences/categories.xul
+% overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/general.xul
+% overlay about:preferences chrome://calendar/content/preferences/general.xul
+% overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/views.xul
+% overlay about:preferences chrome://calendar/content/preferences/views.xul
+% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-unifinder.xul
+% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-unifinder-todo.xul
+% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-task-view.xul
+% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/today-pane.xul
+% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/suite-overlay-sidebar.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% overlay chrome://calendar/content/calendarCreation.xul chrome://lightning/content/lightning-calendar-creation.xul
+% overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://lightning/content/lightning-calendar-properties.xul
+% override chrome://lightning/skin/accountCentral.css chrome://lightning-common/skin/suite-accountCentral.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% content lightning %content/lightning/
+    content/lightning/imip-bar.js                          (content/imip-bar.js)
+    content/lightning/imip-bar-overlay.xul                 (content/imip-bar-overlay.xul)
+    content/lightning/lightning-calendar-creation.xul      (content/lightning-calendar-creation.xul)
+    content/lightning/lightning-calendar-creation.js       (content/lightning-calendar-creation.js)
+    content/lightning/lightning-calendar-properties.xul    (content/lightning-calendar-properties.xul)
+    content/lightning/lightning-calendar-properties.js     (content/lightning-calendar-properties.js)
+    content/lightning/lightning-invitation.xhtml           (content/lightning-invitation.xhtml)
+    content/lightning/lightning-menus.xul                  (content/lightning-menus.xul)
+    content/lightning/lightning-migration.xul              (content/lightning-migration.xul)
+*   content/lightning/lightning-toolbar.xul                (content/lightning-toolbar.xul)
+    content/lightning/lightning-utils.js                   (content/lightning-utils.js)
+    content/lightning/lightning-widgets.css                (content/lightning-widgets.css)
+    content/lightning/lightning-widgets.xml                (content/lightning-widgets.xml)
+    content/lightning/messenger-overlay-accountCentral.xul (content/messenger-overlay-accountCentral.xul)
+    content/lightning/messenger-overlay-messageWindow.xul  (content/messenger-overlay-messageWindow.xul)
+    content/lightning/messenger-overlay-sidebar.js         (content/messenger-overlay-sidebar.js)
+    content/lightning/messenger-overlay-sidebar.xul        (content/messenger-overlay-sidebar.xul)
+    content/lightning/messenger-overlay-preferences.js     (content/messenger-overlay-preferences.js)
+    content/lightning/messenger-overlay-preferences.xul    (content/messenger-overlay-preferences.xul)
+    content/lightning/suite-overlay-addons.xul             (content/suite-overlay-addons.xul)
+    content/lightning/suite-overlay-preferences.xul        (content/suite-overlay-preferences.xul)
+    content/lightning/suite-overlay-sidebar.js             (content/suite-overlay-sidebar.js)
+    content/lightning/suite-overlay-sidebar.xul            (content/suite-overlay-sidebar.xul)
+    content/lightning/lightning-item-toolbar.xul           (content/lightning-item-toolbar.xul)
+*   content/lightning/lightning-item-panel.xul             (content/lightning-item-panel.xul)
+    content/lightning/lightning-item-panel.js              (content/lightning-item-panel.js)
+    content/lightning/lightning-item-iframe.xul            (content/lightning-item-iframe.xul)
+    content/lightning/lightning-item-iframe.js             (content/lightning-item-iframe.js)
+    content/lightning/html-item-editing/lightning-item-iframe.html      (content/html-item-editing/lightning-item-iframe.html)
+    content/lightning/html-item-editing/react-code.js                   (content/html-item-editing/react-code.js)
+% skin lightning classic/1.0 chrome/skin/linux/lightning/
+% skin lightning classic/1.0 chrome/skin/osx/lightning/ os=Darwin
+% skin lightning classic/1.0 chrome/skin/windows/lightning/ os=WINNT
+% skin lightning-common classic/1.0 chrome/skin/lightning-common/
+% style chrome://global/content/customizeToolbar.xul chrome://lightning/skin/lightning-toolbar.css
+% style chrome://calendar/content/calendar-event-dialog.xul chrome://communicator/skin/communicator.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% style chrome://global/content/customizeToolbar.xul chrome://lightning-common/skin/lightning.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% style chrome://global/content/customizeToolbar.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+    ../skin/lightning-common/mode-switch-icons.png            (themes/common/images/mode-switch-icons.png)
+    ../skin/lightning-common/suite-accountCentral.css         (themes/common/suite-accountCentral.css)
+
+# Linux theme files
+    ../skin/linux/lightning/accountCentral.css                (themes/linux/accountCentral.css)
+    ../skin/linux/lightning/imip.css                          (themes/linux/imip.css)
+    ../skin/linux/lightning/lightning.css                     (themes/linux/lightning.css)
+    ../skin/linux/lightning/lightning-toolbar.css             (themes/linux/lightning-toolbar.css)
+    ../skin/linux/lightning/lightning-widgets.css             (themes/linux/lightning-widgets.css)
+
+# OS X theme files
+    ../skin/osx/lightning/accountCentral.css                  (themes/osx/accountCentral.css)
+    ../skin/osx/lightning/imip.css                            (themes/osx/imip.css)
+    ../skin/osx/lightning/collapse.png                        (themes/osx/collapse.png)
+    ../skin/osx/lightning/collapse@2x.png                     (themes/osx/collapse@2x.png)
+    ../skin/osx/lightning/expand.png                          (themes/osx/expand.png)
+    ../skin/osx/lightning/expand@2x.png                       (themes/osx/expand@2x.png)
+    ../skin/osx/lightning/lightning.css                       (themes/osx/lightning.css)
+    ../skin/osx/lightning/lightning-toolbar.css               (themes/osx/lightning-toolbar.css)
+    ../skin/osx/lightning/lightning-widgets.css               (themes/osx/lightning-widgets.css)
+
+# Windows theme files
+    ../skin/windows/lightning/accountCentral.css              (themes/windows/accountCentral.css)
+    ../skin/windows/lightning/imip.css                        (themes/windows/imip.css)
+    ../skin/windows/lightning/imip.png                        (themes/windows/imip.png)
+    ../skin/windows/lightning/lightning.css                   (themes/windows/lightning.css)
+    ../skin/windows/lightning/lightning-toolbar.css           (themes/windows/lightning-toolbar.css)
+    ../skin/windows/lightning/lightning-widgets.css           (themes/windows/lightning-widgets.css)
+    ../skin/windows/lightning/imip-aero.png                   (themes/windows/images/imip-aero.png)
+    ../skin/windows/lightning/mode-switch-icons-aero.png      (themes/windows/images/mode-switch-icons-aero.png)
+    ../skin/windows/lightning/mode-switch-icons-inverted.png  (themes/windows/images/mode-switch-icons-inverted.png)
+
+
+calendar.jar:
+    content/calendar/calendarCreation.xul                  (/calendar/resources/content/calendarCreation.xul)
+    content/calendar/calendarCreation.js                   (/calendar/resources/content/calendarCreation.js)
+    content/calendar/datetimepickers/datetimepickers.css   (/calendar/resources/content/datetimepickers/datetimepickers.css)
+    content/calendar/datetimepickers/datetimepickers.xml   (/calendar/resources/content/datetimepickers/datetimepickers.xml)
+    content/calendar/mouseoverPreviews.js                  (/calendar/resources/content/mouseoverPreviews.js)
+    content/calendar/publish.js                            (/calendar/resources/content/publish.js)
+    content/calendar/publishDialog.js                      (/calendar/resources/content/publishDialog.js)
+    content/calendar/publishDialog.xul                     (/calendar/resources/content/publishDialog.xul)
+    content/calendar/sound.wav                             (/calendar/resources/content/sound.wav)
+    ../skin/lightning-common/datetimepickers.css           (/calendar/resources/skin/datetimepickers.css)
+    ../skin/lightning-common/dialogOverlay.css             (/calendar/resources/skin/dialogOverlay.css)
+    ../skin/lightning-common/imip.css                      (themes/common/imip.css)
+    ../skin/lightning-common/lightning.css                 (themes/common/lightning.css)
+    ../skin/lightning-common/html-item-editing.css         (themes/common/html-item-editing.css)
--- a/calendar/lightning/moz.build
+++ b/calendar/lightning/moz.build
@@ -1,10 +1,57 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
     '../libical',
     '../base',
+    '../providers',
+    '../import-export',
+    '../itip',
+    'components',
+    'locales',
+    'modules',
+]
+
+TEST_DIRS += ['../test']
+
+XPI_NAME = 'lightning'
+export('XPI_NAME')
+
+FINAL_TARGET_PP_FILES += [
+    'app.ini',
+    'install.rdf',
 ]
 
+JAR_MANIFESTS += ['jar.mn']
+
+USE_EXTENSION_MANIFEST = True
+export('USE_EXTENSION_MANIFEST')
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    DEFINES['THEME'] = 'windows'
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    DEFINES['THEME'] = 'osx'
+else:
+    DEFINES['THEME'] = 'linux'
+
+JS_PREFERENCE_PP_FILES += [
+    'content/lightning.js',
+]
+
+FINAL_TARGET_FILES.timezones += [
+    '../timezones/zones.json',
+]
+
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'Lightning Only')
+
+with Files('content/suite-*'):
+    BUG_COMPONENT = ('Calendar', 'Lightning: SeaMonkey Integration')
+
+with Files('build/**'):
+    BUG_COMPONENT = ('Calendar', 'Build Config')
+
+with Files('app.ini'):
+    BUG_COMPONENT = ('Calendar', 'Build Config')
--- a/suite/app.mozbuild
+++ b/suite/app.mozbuild
@@ -10,16 +10,18 @@ include('/toolkit/toolkit.mozbuild')
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
 
 if CONFIG['MOZ_COMPOSER']:
     DIRS += ['/editor/ui']
 
 DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
 
-DIRS += [
+if CONFIG['MOZ_CALENDAR']:
+    DIRS += [
         '/calendar/lightning',
-]
+        '/calendar/timezones'
+    ]
 
 DIRS += [
     '/xpfe/components/autocomplete',
     '/suite',
 ]
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -73,17 +73,17 @@ ifeq ($(MOZ_PACKAGER_FORMAT),omni)
 # application, ones that appear in dist/bin/distribution/extensions will be
 # copied to the profile in installed builds.
 # NOTE: This is a hack to run this at the end of compilation, would be nicer
 # if this was done right away for built-in extensions in omnijar mode.
 
 ABS_STAGE = $(abspath $(STAGEDIST))
 
 define _PACKAGE_EXTENSIONS
-@echo "Packaging $(dir).xpi..."
+@echo "Packaging $(dir)..."
 if test -d "$(ABS_STAGE)/$(dir)"; then \
 cd $(ABS_STAGE)/$(dir)/; \
 $(ZIP) -Dr9mX ../$(dir).xpi * -x \*/.mkdir.done; \
 cd ..; rm -rf $(ABS_STAGE)/$(dir); \
 fi
 
 endef # do not remove the blank line!
 
@@ -93,16 +93,17 @@ endef # do not remove the blank line!
 DONOTPACK = {e2fda1a4%
 
 pack-ext: $(STAGEDIST)
 	@echo "Packaging extensions..."
 	$(foreach dir,$(filter-out $(DONOTPACK),$(subst $(STAGEDIST)/,,$(wildcard $(STAGEDIST)/*))),$(_PACKAGE_EXTENSIONS))
 
 tools::
 	@$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/extensions"
+	@$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/distribution/extensions"
 
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 # Anything below the above ifdef won't be included in mac builds. So be very
 # careful what you add here.
 
 MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
--- a/suite/config/mozconfigs/linux32/debug
+++ b/suite/config/mozconfigs/linux32/debug
@@ -1,12 +1,13 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
+ac_add_options --enable-calendar
 ac_add_options --enable-alsa
 
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux32/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,14 +1,15 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-calendar
 ac_add_options --enable-alsa
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,15 +1,16 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-elf-hack
 ac_add_options --enable-profiling
+ac_add_options --enable-calendar
 ac_add_options --enable-alsa
 
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux32/release
+++ b/suite/config/mozconfigs/linux32/release
@@ -1,13 +1,14 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-calendar
 ac_add_options --enable-alsa
 
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux32/release-l10n
+++ b/suite/config/mozconfigs/linux32/release-l10n
@@ -1,14 +1,15 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-calendar
 ac_add_options --enable-alsa
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux64/l10n-mozconfig
+++ b/suite/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,14 +1,15 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-calendar
 ac_add_options --enable-alsa
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,15 +1,16 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-elf-hack
 ac_add_options --enable-profiling
+ac_add_options --enable-calendar
 ac_add_options --enable-alsa
 
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux64/release
+++ b/suite/config/mozconfigs/linux64/release
@@ -1,13 +1,14 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-calendar
 ac_add_options --enable-alsa
 
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/linux64/release-l10n
+++ b/suite/config/mozconfigs/linux64/release-l10n
@@ -1,14 +1,15 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-calendar
 ac_add_options --enable-alsa
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
--- a/suite/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/suite/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -10,16 +10,20 @@ fi
 . $topsrcdir/build/macosx/universal/mozconfig.common
 . $topsrcdir/suite/config/mozconfigs/mozconfig.macosx.common
 
 ac_add_options --enable-application=suite
 ac_add_options --with-l10n-base=../../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-install-strip
 
+# Build lightning locales
+ac_add_options --enable-calendar
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
--- a/suite/config/mozconfigs/macosx-universal/nightly
+++ b/suite/config/mozconfigs/macosx-universal/nightly
@@ -2,23 +2,28 @@
 # mixed up with host/target CPUs when trying to work out how to do the
 # universal build. When we redo the build system (bug 648979) this will
 # go away.
 if test -e "$topsrcdir/suite/config/version.txt"; then
   unset CC
   unset CXX
 fi
 
+# Make sure Lightning is also unified, this needs to happen before including
+# the universal mozconfig because Lightning's univeral.mk needs to run first.
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+
 . $topsrcdir/build/macosx/universal/mozconfig
 . $topsrcdir/suite/config/mozconfigs/mozconfig.macosx.common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
+ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/macosx-universal/release
+++ b/suite/config/mozconfigs/macosx-universal/release
@@ -2,21 +2,26 @@
 # mixed up with host/target CPUs when trying to work out how to do the
 # universal build. When we redo the build system (bug 648979) this will
 # go away.
 if test -e "$topsrcdir/suite/config/version.txt"; then
   unset CC
   unset CXX
 fi
 
+# Make sure Lightning is also unified, this needs to happen before including
+# the universal mozconfig because Lightning's univeral.mk needs to run first.
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+
 . $topsrcdir/build/macosx/universal/mozconfig
 . $topsrcdir/suite/config/mozconfigs/mozconfig.macosx.common
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/macosx-universal/release-l10n
+++ b/suite/config/mozconfigs/macosx-universal/release-l10n
@@ -1,15 +1,19 @@
 . $topsrcdir/build/macosx/universal/mozconfig.common
 . $topsrcdir/suite/config/mozconfigs/mozconfig.macosx.common
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
+# Build lightning locales
+ac_add_options --enable-calendar
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
--- a/suite/config/mozconfigs/macosx64/release-l10n
+++ b/suite/config/mozconfigs/macosx64/release-l10n
@@ -1,15 +1,19 @@
 . $topsrcdir/build/mozconfig.common
 . $topsrcdir/suite/config/mozconfigs/mozconfig.macosx.common
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
+# Build lightning locales
+ac_add_options --enable-calendar
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
 
--- a/suite/config/mozconfigs/win32/debug
+++ b/suite/config/mozconfigs/win32/debug
@@ -1,14 +1,15 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-require-all-d3dc-versions
+ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/win32/l10n-mozconfig
+++ b/suite/config/mozconfigs/win32/l10n-mozconfig
@@ -1,16 +1,17 @@
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 ac_add_options --enable-require-all-d3dc-versions
+ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/win32/nightly
+++ b/suite/config/mozconfigs/win32/nightly
@@ -2,16 +2,17 @@
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling
 ac_add_options --enable-require-all-d3dc-versions
+ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/win32/release
+++ b/suite/config/mozconfigs/win32/release
@@ -1,16 +1,17 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 ac_add_options --enable-require-all-d3dc-versions
+ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/win32/release-l10n
+++ b/suite/config/mozconfigs/win32/release-l10n
@@ -1,15 +1,16 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.win.common"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/win64/debug
+++ b/suite/config/mozconfigs/win64/debug
@@ -1,16 +1,17 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-debug
+ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/win64/l10n-mozconfig
+++ b/suite/config/mozconfigs/win64/l10n-mozconfig
@@ -3,16 +3,17 @@
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
+ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/config/mozconfigs/win64/nightly
+++ b/suite/config/mozconfigs/win64/nightly
@@ -5,16 +5,17 @@
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling
+ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=0
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -8,17 +8,17 @@ MOZ_APP_VENDOR=Mozilla
 MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
 MOZ_LDAP_XPCOM=1
 MOZ_COMPOSER=1
 MOZ_DISABLE_EXPORT_JS=1
 MOZ_SUITE=1
 MOZ_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
-MOZ_EXTENSIONS_DEFAULT=" gio"
+MOZ_EXTENSIONS_DEFAULT=" inspector irc gio"
 MOZ_UPDATER=1
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=seamonkey-comm-release
 MOZ_MORK=1
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -899,18 +899,72 @@ bin/libfreebl_32int64_3.so
 @BINPATH@/llvm-symbolizer
 #endif
 #endif
 
 #if defined(MOZ_ASAN) && defined(CLANG_CL)
 @BINPATH@/clang_rt.asan_dynamic-i386.dll
 #endif
 
+[chatzilla]
+#ifdef MOZ_OMNIJAR
+@RESPATH@/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
+#else
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/chatzilla@JAREXT@
+#ifdef MOZ_GTK
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm
+#elifdef XP_WIN32
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.ico
+#endif
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/components.list
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf
+#endif
+#ifdef LOCALE_BUILD
+#ifdef MOZ_OMNIJAR
+@RESPATH@/distribution/extensions/langpack-@AB_CD@@chatzilla.mozilla.org.xpi
+#else
+@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome/chatzilla@JAREXT@
+@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome.manifest
+@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.js
+@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.rdf
+#endif
+#endif
+
+[inspector]
+#ifdef MOZ_OMNIJAR
+@RESPATH@/distribution/extensions/inspector@mozilla.org.xpi
+#else
+@RESPATH@/extensions/inspector@mozilla.org/install.rdf
+@RESPATH@/extensions/inspector@mozilla.org/chrome.manifest
+@RESPATH@/extensions/inspector@mozilla.org/chrome/inspector@JAREXT@
+#ifdef MOZ_GTK
+@RESPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
+@RESPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
+#elifdef XP_WIN32
+@RESPATH@/extensions/inspector@mozilla.org/platform/WINNT/chrome/icons/default/winInspectorMain.ico
+#endif
+@RESPATH@/extensions/inspector@mozilla.org/components/components.list
+@RESPATH@/extensions/inspector@mozilla.org/components/inspector-cmdline.js
+@RESPATH@/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
+#endif
+
 [debugqa]
 #ifdef MOZ_PACKAGE_DEBUGQA
 #ifdef MOZ_OMNIJAR
 @RESPATH@/distribution/extensions/debugQA@mozilla.org.xpi
 #else
 @RESPATH@/extensions/debugQA@mozilla.org/install.rdf
 @RESPATH@/extensions/debugQA@mozilla.org/chrome.manifest
 @RESPATH@/extensions/debugQA@mozilla.org/chrome/debugqa@JAREXT@
 #endif
 #endif
+
+#ifdef MOZ_CALENDAR
+[calendar]
+#ifdef NIGHTLY_BUILD
+@RESPATH@/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
+#else
+@RESPATH@/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
+#endif
+#endif
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -109,21 +109,26 @@ PANELS_XTRA_FILE = $(call MERGE_FILE,pro
 	  profile/panels.rdf.in -o $@)
 
 libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
 libs:: $(FINAL_TARGET)/defaults/profile/panels.rdf ;
 
 libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
 
+# Extend l10n.mk clobber-% target for our localised extensions
+clobber-%:
+	$(RM) -rf $(DIST)/xpi-stage/chatzilla-$* $(DIST)/xpi-stage/chatzilla-*.$*.xpi
+
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$*
 	@$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$*
+	@$(MAKE) -C $(DEPTH)/extensions/irc/locales libs-$*
 	@$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
 
 repackage-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
 repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES)
 	@echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).'
@@ -154,18 +159,20 @@ clobber-zip:
 	  $(STAGEDIST)/defaults/profile \
 	  $(STAGEDIST)/chrome/$(AB_CD) \
 	  $(STAGEDIST)/extensions/langpack-$(AB_CD)@* \
 	  $(STAGEDIST)/distribution/extensions/langpack-$(AB_CD)@* \
 
 repackage-zip: repackage-extensions
 
 repackage-extensions: $(STAGEDIST)
+	$(MAKE) -C $(DEPTH)/extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST)
 ifeq ($(MOZ_PACKAGER_FORMAT),omni)
 	$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST)/extensions;
+	$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST)/distribution/extensions;
 endif
 
 repackage-zip-%: $(call ESCAPE_WILDCARD,$(ZIP_IN)) $(STAGEDIST) libs-%
 	@$(MAKE) repackage-zip AB_CD=$* ZIP_IN=$(ZIP_IN)
 
 langpack: langpack-$(AB_CD)
 
 ifdef MOZ_UPDATER
@@ -203,16 +210,18 @@ merge-%:
 ifdef LOCALE_MERGEDIR
 	$(RM) -rf $(LOCALE_MERGEDIR)
 	$(topsrcdir)/mozilla/mach compare-locales --merge-dir $(LOCALE_MERGEDIR) --l10n-ini $(srcdir)/l10n.ini $*
 endif
 	@echo
 
 .PHONY: repackage-extensions
 
+MOZ_PKG_EXTRAL10N += extensions/langpack-$(AB_CD)@chatzilla.mozilla.org=$(DIST)/xpi-stage/chatzilla-$(AB_CD)
+
 ifdef MOZ_CALENDAR
 LIGHTNING_PATH=$(DEPTH)/calendar/lightning
 GDATA_PATH=$(DEPTH)/calendar/providers/gdata
 
 define run-calendar-rule
 $(MAKE) -C $(LIGHTNING_PATH) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) $(subst calendar-,,$@)
 $(MAKE) -C $(GDATA_PATH) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) $(subst calendar-,,$@)
 endef
@@ -245,25 +254,27 @@ calendar-wget-en-US: sm-wget-en-US
 calendar-unpack:
 	$(run-calendar-rule)
 calendar-upload:
 	$(MAKE) -C $(LIGHTNING_PATH) upload AB_CD=$(AB_CD)
 
 # Hook into l10n.mk, providing extra arguments to l10n-repack.py
 ifdef NIGHTLY_BUILD
 MOZ_PKG_EXTRAL10N += extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
+else
+MOZ_PKG_EXTRAL10N += distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
 endif
 
 # Hook calendar targets to the mail non-pattern rules
 wget-en-US: calendar-wget-en-US
 unpack: calendar-unpack
 upload: calendar-upload
 
 # Hook into the pattern rules, this will be used later on in the installers-% target.
 CALENDAR_INSTALLERS_TARGETS = calendar-merge-% calendar-clobber-% calendar-langpack-% calendar-repackage-zip-%
 endif
 
 # This is a generic target that will make a langpack, repack ZIP (+tarball)
 # builds, and repack and installer if applicable. It is called from the
 # tinderbox scripts. Alter it with caution.
-INSTALLERS_TARGETS = clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
+INSTALLERS_TARGETS = clobber-% $(CALENDAR_INSTALLERS_TARGETS) langpack-% repackage-win32-installer-% repackage-zip-%
 installers-%: $(INSTALLERS_TARGETS)
 	@echo 'repackaging done'