Author: erinn Date: 2011-11-12 01:10:14 +0000 (Sat, 12 Nov 2011) New Revision: 25202 Modified: website/trunk/Makefile website/trunk/include/versions.wmi website/trunk/publish Log: bump tbb versions to 2.2.34-2 Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-11-11 16:06:53 UTC (rev 25201) +++ website/trunk/Makefile 2011-11-12 01:10:14 UTC (rev 25202) @@ -10,9 +10,9 @@ # 4. make # 5. ./publish -export TORGIT=/home/runa/tordev/tor/.git -export STABLETAG=tor-0.2.2.33 -export DEVTAG=tor-0.2.3.5-alpha +export TORGIT=/Users/erinn/src/tor.git/.git +export STABLETAG=tor-0.2.2.24-alpha +export DEVTAG=tor-0.2.2.24-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-11-11 16:06:53 UTC (rev 25201) +++ website/trunk/include/versions.wmi 2011-11-12 01:10:14 UTC (rev 25202) @@ -27,27 +27,27 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.34</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.6-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.34-1</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.34-2</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.14-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>7.0.1</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.15-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>8.0</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.34-1</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.34-1</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.34-2</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.34-2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.14, zlib-1.2.5, openssl-1.0.0e</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>7.0.1</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.15-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>8.0</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>2.2.34-1</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>2.2.34-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>7.0.1</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>8.0</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2011-11-11 16:06:53 UTC (rev 25201) +++ website/trunk/publish 2011-11-12 01:10:14 UTC (rev 25202) @@ -1,16 +1,13 @@ #!/bin/sh set -e # stop if we encounter an error -make clean # clean cruft +svn update +make -j3 -svn update # get changes - -make -j3 # abuse the cores - # don't copy over stuff with permissions that make it useless chmod -R a+r * -rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum.torproject.org:/srv/www-master.torproject.org/htdocs +rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update" -ssh vescum.torproject.org '/home/mirroradm/bin/trigger-mirrors' -ssh vescum.torproject.org chmod g+w -R /srv/www-master.torproject.org/htdocs +ssh vescum '/home/mirroradm/bin/trigger-mirrors' +ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs