commit a48195afe62b3646625fbfa18bbe075ce554d5e1
Author: Nicolas Vigier <bo...@torproject.org>
Date: Mon Dec 3 21:18:22 2018 +0100
Use same Tor Browser version number for Android and other platforms
Tor Browser for Android is now using the same version number as the
others alpha Tor Browser bundles, and is in the same directory on
dist.tpo.
---
download/en/download-easy.wml | 4 ++--
download/en/download.wml | 4 ++--
include/versions.wmi | 6 ++----
projects/en/torbrowser.wml | 6 +++---
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index 8b844610..76a75a9d 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -194,9 +194,9 @@
the app. We plan on fixing it for the next release.
</p>
<form class="downloads">
- <a class="button"
href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/tor-browser-android-arm-<version-torbrowserbundleandroid>.apk"><span
class="strong">Download</span><span class="normal">Android</span></a>
+ <a class="button"
href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-android-<version-torbrowserbundleandroidbeta>-armv7.apk"><span
class="strong">Download</span><span class="normal">Android</span></a>
<div class="sig">
- (<a class="android-tbb-sig"
href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/TorBrowser-<version-torbrowserbundleandroid>.asc">sig</a>)
+ (<a class="android-tbb-sig"
href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-android-<version-torbrowserbundleandroidbeta>-armv7.apk.asc">sig</a>)
<a class="siginfo" href="<page
docs/verifying-signatures>">What's This?</a>
</div>
</form>
diff --git a/download/en/download.wml b/download/en/download.wml
index ff40c486..16da8209 100644
--- a/download/en/download.wml
+++ b/download/en/download.wml
@@ -165,9 +165,9 @@ custom configurations. All an apt-get or yum install
away.</p>
<div class="fauxhead"></div>
<div class="package" style="padding-top: 13px; border-top: 0px;">
<form class="downloads">
- <a class="button"
href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/tor-browser-android-arm-<version-torbrowserbundleandroid>.apk"><span
class="strong">Download</span><span class="normal">Android</span></a>
+ <a class="button"
href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-android-<version-torbrowserbundleandroidbeta>-armv7.apk"><span
class="strong">Download</span><span class="normal">Android</span></a>
<div class="sig">
- (<a class="android-tbb-sig"
href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/tor-browser-android-arm-<version-torbrowserbundleandroid>.apk.asc">sig</a>)
+ (<a class="android-tbb-sig"
href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-android-<version-torbrowserbundleandroidbeta>-armv7.apk.asc">sig</a>)
<a class="siginfo" href="<page
docs/verifying-signatures>">What's This?</a>
</div>
</form>
diff --git a/include/versions.wmi b/include/versions.wmi
index 2c39bfbc..e807994c 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -41,12 +41,10 @@
<let
releasedate-torbrowserbundlelinux64beta=releasedate-torbrowserbundlebeta-all />
<let version-torbrowserbundleosx64beta=version-torbrowserbundlebeta-all />
<let
releasedate-torbrowserbundleosx64beta=releasedate-torbrowserbundlebeta-all />
+<let version-torbrowserbundleandroidbeta=version-torbrowserbundlebeta-all />
+<let
releasedate-torbrowserbundleandroidbeta=releasedate-torbrowserbundlebeta-all />
<define-tag file-source-stable
whitespace=delete>tor-<version-stable>.tar.gz</define-tag>
<define-tag package-source-stable
whitespace=delete>../dist/<file-source-stable></define-tag>
<define-tag file-source-alpha
whitespace=delete>tor-<version-alpha>.tar.gz</define-tag>
<define-tag package-source-alpha
whitespace=delete>../dist/<file-source-alpha></define-tag>
-
-# *** tor browser android ***
-<define-tag version-torbrowserbundleandroid
whitespace=delete>1.0a3</define-tag>
-<define-tag releasedate-torbrowserbundleandroid
whitespace=delete>2018-10-31</define-tag>
diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 172ce411..7f3c8ec0 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -512,7 +512,7 @@
<th>Microsoft
Windows<br><em>(<version-torbrowserbundlebeta>)</em></th>
<th>Mac OS X<br><em>(<version-torbrowserbundleosx64beta>)</em></th>
<th>Linux<br><em>(<version-torbrowserbundlelinux32beta>)</em></th>
- <th>Android<br><em>(<version-torbrowserbundleandroid>)</em></th>
+ <th>Android<br><em>(<version-torbrowserbundleandroidbeta>)</em></th>
</tr>
</thead>
<tbody>
@@ -531,8 +531,8 @@
<em>(<a
href="../dist/torbrowser/<version-torbrowserbundlelinux32beta>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_en-US.tar.xz.asc">sig</a>)</em>
• <a
href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_en-US.tar.xz">64-bit</a>
<em>(<a
href="../dist/torbrowser/<version-torbrowserbundlelinux64beta>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_en-US.tar.xz.asc">sig</a>)</em></td>
- <td><a
href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/tor-browser-android-arm-<version-torbrowserbundleandroid>.apk">Android</a>
- <em>(<a
href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/tor-browser-android-arm-<version-torbrowserbundleandroid>.apk.asc">sig</a>)</em></td>
+ <td><a
href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-android-<version-torbrowserbundleandroidbeta>-armv7.apk">Android</a>
+ <em>(<a
href="../dist/torbrowser/<version-torbrowserbundleandroidbeta>/tor-browser-android-<version-torbrowserbundleandroidbeta>-armv7.apk.asc">sig</a>)</em></td>
</tr>
<tr class="alt">
<td>العربية
(ar)</td>
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
