[tor-commits] [tor-messenger-build/master] Rebase cert-installer.patch

[arlo at torproject.org]

commit 43e68d2b80e1b7ee7c7f78fb499c687a8e8d0b83
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Sat Mar 19 07:48:23 2016 -0400

    Rebase cert-installer.patch
---
 projects/instantbird/cert-installer.patch | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/projects/instantbird/cert-installer.patch b/projects/instantbird/cert-installer.patch
index 58e8020..b514b9f 100644
--- a/projects/instantbird/cert-installer.patch
+++ b/projects/instantbird/cert-installer.patch
@@ -3,17 +3,16 @@ diff --git a/im/app/profile/moz.build b/im/app/profile/moz.build
 +++ b/im/app/profile/moz.build
 @@ -9,6 +9,7 @@
      DEFINES['HAVE_SHELL_SERVICE'] = 1
-
+ 
  FINAL_TARGET_FILES.defaults.profile += [
 +    'cert_override.txt',
      'localstore.rdf',
      'mimeTypes.rdf',
  ]
 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 @@
+@@ -160,6 +160,7 @@
  @RESPATH@/defaults/profile/localstore.rdf
  @RESPATH@/defaults/profile/prefs.js
  @RESPATH@/defaults/profile/mimeTypes.rdf
@@ -22,10 +21,9 @@ index edf01b1..78db5e4 100644
  #ifdef XP_MACOSX
  @RESPATH@/components/ibDockBadge.js
 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
+@@ -109,7 +109,9 @@
  MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
  endif
  
@@ -34,5 +32,5 @@ index 0234b21..5d20e62 100644
 +       defaults/profile/cert_override.txt \
 +       $(NULL)
  
- ifndef LIBXUL_SDK
  INSTALL_SDK = 1
+