[tor-commits] [tor-messenger-build/master] Add duplicated files to allowed-dupes.mn

sukhbir at torproject.org sukhbir at torproject.org
Mon Jul 31 14:49:38 UTC 2017


commit ff744ca7a9067bb2f7c853cd6e5f27869d6f6cfa
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Wed Jun 28 16:55:14 2017 -0400

    Add duplicated files to allowed-dupes.mn
---
 ...-Add-duplicated-files-to-allowed-dupes.mn.patch | 29 ++++++++++++++++++++++
 projects/instantbird/config                        |  1 +
 2 files changed, 30 insertions(+)

diff --git a/projects/instantbird/0029-Add-duplicated-files-to-allowed-dupes.mn.patch b/projects/instantbird/0029-Add-duplicated-files-to-allowed-dupes.mn.patch
new file mode 100644
index 0000000..98ea665
--- /dev/null
+++ b/projects/instantbird/0029-Add-duplicated-files-to-allowed-dupes.mn.patch
@@ -0,0 +1,29 @@
+From 788fb16fed2bb0910a2385b1b315312c42b9f369 Mon Sep 17 00:00:00 2001
+From: Sukhbir Singh <sukhbir at torproject.org>
+Date: Wed, 28 Jun 2017 16:49:51 -0400
+Subject: [PATCH] Add duplicated files to allowed-dupes.mn
+
+---
+ im/installer/allowed-dupes.mn | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/im/installer/allowed-dupes.mn b/im/installer/allowed-dupes.mn
+index 988dc2d35a..ed26b72f97 100644
+--- a/im/installer/allowed-dupes.mn
++++ b/im/installer/allowed-dupes.mn
+@@ -10,6 +10,12 @@ chrome/instantbird/skin/classic/instantbird/messages/simple/Variants/Normal.css
+ chrome/instantbird/skin/classic/instantbird/messages/simple/Incoming/Context.html
+ chrome/instantbird/skin/classic/instantbird/messages/simple/Incoming/NextContext.html
+ chrome/chat/content/chat/conv.html
++chrome/toolkit/skin/classic/global/icons/collapse.png
++chrome/instantbird/skin/classic/instantbird/collapse.png
++chrome/toolkit/skin/classic/global/icons/expand.png
++chrome/instantbird/skin/classic/instantbird/expand.png
++chrome/icons/default/default16.png
++icons/default16.png
+ 
+ # Variants of paths in mozilla/browser/installer/allowed-dupes.mn
+ # and mail/installer/allowed-dupes.mn:
+-- 
+2.11.0
+
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 08c4402..0c55f0a 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -91,6 +91,7 @@ input_files:
   - filename: 0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch
   - filename: 0027-Trac-17517-Use-different-color-for-Add-Exception.patch
   - filename: 0028-Trac-21736-Hide-account-timestamp-from-message.patch
+  - filename: 0029-Add-duplicated-files-to-allowed-dupes.mn.patch
   - filename: mozconfig-common
   - filename: 'mozconfig-[% c("var/osname") %]'
     name: mozconfig





More information about the tor-commits mailing list