From 4e5649b5157b858602f16cc091b6fd526b4f041a Mon Sep 17 00:00:00 2001 From: Jorg K Date: Thu, 17 May 2018 13:09:44 +0200 Subject: [PATCH] Port bug 1451050 - fix paths of blocklists, pinning, add main. rs=bustage-fix --- mail/installer/package-manifest.in | 5 +++-- suite/installer/package-manifest.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in index 2248a8ea02..89798ef8e8 100644 --- a/mail/installer/package-manifest.in +++ b/mail/installer/package-manifest.in @@ -316,8 +316,9 @@ @RESPATH@/defaults/pref/mdn.js @RESPATH@/defaults/pref/smime.js @RESPATH@/defaults/pref/thunderbird-branding.js -@RESPATH@/defaults/blocklists -@RESPATH@/defaults/pinning +@RESPATH@/defaults/settings/blocklists +@RESPATH@/defaults/settings/pinning +@RESPATH@/defaults/settings/main @RESPATH@/greprefs.js ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in index f70e50b997..c561081aea 100644 --- a/suite/installer/package-manifest.in +++ b/suite/installer/package-manifest.in @@ -444,8 +444,9 @@ @RESPATH@/greprefs.js @RESPATH@/defaults/autoconfig/prefcalls.js @RESPATH@/defaults/permissions -@RESPATH@/defaults/blocklists -@RESPATH@/defaults/pinning +@RESPATH@/defaults/settings/blocklists +@RESPATH@/defaults/settings/pinning +@RESPATH@/defaults/settings/main ; Warning: changing the path to channel-prefs.js can cause bugs. (Bug 756325) @RESPATH@/defaults/pref/channel-prefs.js