[tor-commits] [tor-messenger-build/master] installer.patch is for cert_override.txt

[sukhbir at torproject.org]

commit cc71b2eee5941e20f02e7dc735532c0a33712d13
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Sat Apr 25 09:45:26 2015 -0400

    installer.patch is for cert_override.txt
---
 projects/instantbird/cert-installer.patch |   39 +++++++++++++++++++++++++++++
 projects/instantbird/installer.patch      |   39 -----------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/projects/instantbird/cert-installer.patch b/projects/instantbird/cert-installer.patch
new file mode 100644
index 0000000..3ba7e32
--- /dev/null
+++ b/projects/instantbird/cert-installer.patch
@@ -0,0 +1,39 @@
+diff --git a/im/app/profile/Makefile.in b/im/app/profile/Makefile.in
+index 4f48e97..4e02fdf 100644
+--- a/im/app/profile/Makefile.in
++++ b/im/app/profile/Makefile.in
+@@ -15,6 +15,7 @@ include $(topsrcdir)/config/rules.mk
+ FILES := \
+ 	mimeTypes.rdf \
+ 	localstore.rdf \
++	cert_override.txt \
+ 	$(NULL)
+ 
+ libs:: $(FILES)
+diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in
+index 0234b21..5d20e62 100644
+--- a/im/installer/Makefile.in
++++ b/im/installer/Makefile.in
+@@ -113,7 +113,9 @@ MOZ_PKG_MAC_ICON=branding/disk.icns
+ MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
+ endif
+ 
+-NON_OMNIJAR_FILES =
++NON_OMNIJAR_FILES = \
++	defaults/profile/cert_override.txt \
++	$(NULL)
+ 
+ ifndef LIBXUL_SDK
+ INSTALL_SDK = 1
+diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in
+index edf01b1..78db5e4 100644
+--- a/im/installer/package-manifest.in
++++ b/im/installer/package-manifest.in
+@@ -155,6 +155,7 @@
+ @RESPATH@/defaults/profile/localstore.rdf
+ @RESPATH@/defaults/profile/prefs.js
+ @RESPATH@/defaults/profile/mimeTypes.rdf
++ at RESPATH@/defaults/profile/cert_override.txt
+ 
+ #ifdef XP_MACOSX
+ @RESPATH@/components/ibDockBadge.js
diff --git a/projects/instantbird/installer.patch b/projects/instantbird/installer.patch
deleted file mode 100644
index 3ba7e32..0000000
--- a/projects/instantbird/installer.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/im/app/profile/Makefile.in b/im/app/profile/Makefile.in
-index 4f48e97..4e02fdf 100644
---- a/im/app/profile/Makefile.in
-+++ b/im/app/profile/Makefile.in
-@@ -15,6 +15,7 @@ include $(topsrcdir)/config/rules.mk
- FILES := \
- 	mimeTypes.rdf \
- 	localstore.rdf \
-+	cert_override.txt \
- 	$(NULL)
- 
- libs:: $(FILES)
-diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in
-index 0234b21..5d20e62 100644
---- a/im/installer/Makefile.in
-+++ b/im/installer/Makefile.in
-@@ -113,7 +113,9 @@ MOZ_PKG_MAC_ICON=branding/disk.icns
- MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
- endif
- 
--NON_OMNIJAR_FILES =
-+NON_OMNIJAR_FILES = \
-+	defaults/profile/cert_override.txt \
-+	$(NULL)
- 
- ifndef LIBXUL_SDK
- INSTALL_SDK = 1
-diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in
-index edf01b1..78db5e4 100644
---- a/im/installer/package-manifest.in
-+++ b/im/installer/package-manifest.in
-@@ -155,6 +155,7 @@
- @RESPATH@/defaults/profile/localstore.rdf
- @RESPATH@/defaults/profile/prefs.js
- @RESPATH@/defaults/profile/mimeTypes.rdf
-+ at RESPATH@/defaults/profile/cert_override.txt
- 
- #ifdef XP_MACOSX
- @RESPATH@/components/ibDockBadge.js