thunderbird3.1.source.patch.path = trustedbird-patch-source-3.1
-# List of add-ons to build with the 'package-addons' target (add the special packages "all-addons-trustedbird2", "all-addons-tb2" and "all-addons-tb3" at the end in order to build the meta-packages)
-addon.list = card-viewer-extended,check-recipients,crl-over-ldap,directoryContactTabsEngine,directoryContactTabsData-template,directoryContactTabsData-sample,dsn-settings,mailXFormsEngine,mailXFormsData-template,mailXFormsData-sample,mdn-extended,multi-ldap,notification-viewer,out-of-office,send-format-ldap,trustedbird2-l10n-fr,trustedbird3.1-l10n-fr,ximfmail,ximfmail-company,xsmtp,all-addons-trustedbird2,all-addons-tb2,all-addons-tb3
+# List of add-ons to build with the 'package-addons' target (add the special packages "all-addons-tb2" and "all-addons-tb30" at the end in order to build the meta-packages)
+addon.list = card-viewer-extended,check-recipients,crl-over-ldap,directoryContactTabsEngine,directoryContactTabsData-template,directoryContactTabsData-sample,dsn-settings,mailXFormsEngine,mailXFormsData-template,mailXFormsData-sample,mdn-extended,multi-ldap,notification-viewer,out-of-office,send-format-ldap,trustedbird2-l10n-fr,trustedbird3.1-l10n-fr,ximfmail,ximfmail-company,xsmtp,all-addons-tb2,all-addons-tb30
# Available add-ons
addon.xsmtp.path = xsmtp
# Meta-packages
-addon.all-addons-trustedbird2.path = all-addons-trustedbird2
-addon.all-addons-trustedbird2.includes = *.xpi
-addon.all-addons-trustedbird2.excludes = mailXForms* directoryContactTabs* dsn-settings* *-l10n-* ximfmail* xsmtp*
addon.all-addons-tb2.path = all-addons-tb2
-addon.all-addons-tb2.includes = *.xpi
-addon.all-addons-tb2.excludes = mailXForms* mrs-* directoryContactTabs* dsn-settings* *-l10n-* ximfmail* xsmtp*
-addon.all-addons-tb3.path = all-addons-tb3
-addon.all-addons-tb3.includes = *.xpi
-addon.all-addons-tb3.excludes = card-viewer-extended* check-recipients* mdn-extended* mrs-* send-format-ldap* *-l10n-* ximfmail* xsmtp*
+addon.all-addons-tb2.includes = card-viewer-extended*xpi check-recipients*xpi crl-over-ldap*xpi mdn-extended*xpi multi-ldap*xpi notification-viewer*xpi out-of-office*xpi send-format-ldap*xpi
+addon.all-addons-tb30.path = all-addons-tb30
+addon.all-addons-tb30.includes = crl-over-ldap*xpi directoryContactTabs*xpi dsn-settings*xpi mailXForms*xpi mdn-extended*xpi multi-ldap*xpi notification-viewer*xpi out-of-office*xpi
+addon.all-addons-tb30.excludes = directoryContactTabsData-template*xpi mailXFormsData-template*xpi
# Files that must be excluded from add-on packages
addon.excludesfile = excludes.txt