From 87cdf5fd79937dc562b0333dadf48259a8c01464 Mon Sep 17 00:00:00 2001
From: Andrew Lewman <andrew@torproject.org>
Date: Mon, 27 Oct 2008 03:19:07 +0000
Subject: [PATCH] package id should be org.torproject not net.freehaven.  Fix
 the torbutton version in postflight.

svn:r17159
---
 contrib/osx/TorBundleInfo.plist.in | 2 +-
 contrib/osx/TorPostflight          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/osx/TorBundleInfo.plist.in b/contrib/osx/TorBundleInfo.plist.in
index e477e5865d..8a74239d36 100644
--- a/contrib/osx/TorBundleInfo.plist.in
+++ b/contrib/osx/TorBundleInfo.plist.in
@@ -7,7 +7,7 @@
 	<key>CFBundleGetInfoString</key>
 	<string>Tor Bundle @VERSION@</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.freehaven.torbundle</string>
+	<string>org.torproject.torbundle</string>
 	<key>CFBundleSortVersionString</key>
 	<string>@VERSION@</string>
 	<key>IFPkgFlagComponentDirectory</key>
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index 2d4f49b3ec..fa3c413d95 100644
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -46,7 +46,7 @@ TORGROUP=daemon
 TARGET=$2/Library/Tor
 TORDIR=$TARGET/var/lib/tor
 LOGFILE=/var/log/tor.log
-TORBUTTON_VERSION="1.2.0rc5"
+TORBUTTON_VERSION="1.2.0-fx"
 
 # Check defaults for TARGET
 if [ "$TARGET" == "//Library/Tor" ]; then