[tor-commits] [tor-browser-bundle/master] fixup! Bug 15689: Switch back to HTTPS-E git repository

[gk at torproject.org]

commit c5e0b0b7517e5e1e2dfe23506db2d9b7b0939ef1
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Apr 21 11:29:28 2015 +0000

    fixup! Bug 15689: Switch back to HTTPS-E git repository
    
    Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
---
 gitian/descriptors/linux/gitian-bundle.yml   |    2 ++
 gitian/descriptors/mac/gitian-bundle.yml     |    2 ++
 gitian/descriptors/windows/gitian-bundle.yml |    2 ++
 3 files changed, 6 insertions(+)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml
index f5ad824..455fc89 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -101,6 +101,8 @@ script: |
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
   rm -f .git/refs/heads/master
   ./makexpi.sh
+  # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
+  rm ./pkg/*-amo.xpi
   cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere at eff.org.xpi
   cd ..
   #
diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index 7945f5e..61a024b 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -109,6 +109,8 @@ script: |
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
   rm -f .git/refs/heads/master
   ./makexpi.sh
+  # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
+  rm ./pkg/*-amo.xpi
   cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere at eff.org.xpi
   cd ..
   #
diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml
index d089e0d..92b9382 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -88,6 +88,8 @@ script: |
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
   rm -f .git/refs/heads/master
   ./makexpi.sh
+  # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
+  rm ./pkg/*-amo.xpi
   cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere at eff.org.xpi
   cd ..
   #