Ajdust packaging files for grepref changes in core bug 507288, blanket rs=philor,a=Standard8
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 07 Oct 2009 14:09:54 +0100
changeset 4072 41a1857f1987bf702d42e5b0dbb424d40668d992
parent 4071 661df4fe22c7300de310ade8cee550b909d1803e
child 4073 29ff73266a7ff35893c03a2030b5f42bb6bcd764
push id3180
push userbugzilla@standard8.plus.com
push dateWed, 07 Oct 2009 13:10:50 +0000
treeherdercomm-central@41a1857f1987 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilor, Standard8
bugs507288
Ajdust packaging files for grepref changes in core bug 507288, blanket rs=philor,a=Standard8
mail/installer/removed-files.in
mail/installer/windows/packages-static
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -140,16 +140,24 @@ defaults/shortcuts/
 #endif
 defaults/wallet/VcardSchema.tbl
 defaults/wallet/FieldSchema.tbl
 defaults/wallet/SchemaConcat.tbl
 defaults/wallet/DistinguishedSchema.tbl
 defaults/wallet/SchemaStrings.tbl
 defaults/wallet/PositionalSchema.tbl
 defaults/wallet/StateSchema.tbl
+#ifdef MOZILLA_1_9_1_BRANCH
+greprefs.js
+#else
+greprefs/all.js
+greprefs/security-prefs.js
+greprefs/xpinstall.js
+greprefs/
+#endif
 #ifdef MOZ_WIDGET_GTK2
 icons/mozicon128.png
 icons/mozicon16.xpm
 icons/mozicon50.xpm
 #endif
 init.d/README
 isp/gmail.rdf
 modules/JSON.jsm
--- a/mail/installer/windows/packages-static
+++ b/mail/installer/windows/packages-static
@@ -164,17 +164,21 @@ bin\chrome\classic.manifest
 ; default pref files
 bin\defaults\pref\all-thunderbird.js
 bin\defaults\pref\channel-prefs.js
 bin\defaults\pref\composer.js
 bin\defaults\pref\mailnews.js
 bin\defaults\pref\mdn.js
 bin\defaults\pref\smime.js
 bin\defaults\pref\thunderbird-branding.js
+#ifdef MOZILLA_1_9_1_BRANCH
 bin\greprefs\*
+#else
+bin\greprefs.js
+#endif
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; App extensions to Mail
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; LDAP components
 bin\components\mozldap.xpt
 bin\components\nsAbLDAPAttributeMap.js