[or-cvs] r17459: {tor} backport r17458, It's Short not Sort. Fix path to package li (tor/branches/tor-0_2_0-patches/contrib/osx)

[phobos@xxxxxxxx]

Author: phobos
Date: 2008-12-02 18:48:38 -0500 (Tue, 02 Dec 2008)
New Revision: 17459

Modified:
   tor/branches/tor-0_2_0-patches/contrib/osx/TorBundleInfo.plist.in
   tor/branches/tor-0_2_0-patches/contrib/osx/TorInfo.plist.in
   tor/branches/tor-0_2_0-patches/contrib/osx/TorStartupInfo.plist
   tor/branches/tor-0_2_0-patches/contrib/osx/uninstall_tor_bundle.sh
Log:
backport r17458, It's Short not Sort.  Fix path to package list.


Modified: tor/branches/tor-0_2_0-patches/contrib/osx/TorBundleInfo.plist.in
===================================================================
--- tor/branches/tor-0_2_0-patches/contrib/osx/TorBundleInfo.plist.in	2008-12-02 23:47:27 UTC (rev 17458)
+++ tor/branches/tor-0_2_0-patches/contrib/osx/TorBundleInfo.plist.in	2008-12-02 23:48:38 UTC (rev 17459)
@@ -7,8 +7,8 @@
 	<key>CFBundleGetInfoString</key>
 	<string>Tor Bundle @VERSION@</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.torproject.torbundle</string>
-	<key>CFBundleSortVersionString</key>
+	<string>net.freehaven.torbundle</string>
+	<key>CFBundleShortVersionString</key>
 	<string>@VERSION@</string>
 	<key>IFPkgFlagComponentDirectory</key>
 	<string>../.contained_packages</string>
@@ -22,28 +22,10 @@
 		</dict>
 		<dict>
 			<key>IFPkgFlagPackageLocation</key>
-			<string>Privoxy.pkg</string>
-			<key>IFPkgFlagPackageSelection</key>
-			<string>selected</string>
-		</dict>
-		<dict>
-			<key>IFPkgFlagPackageLocation</key>
-			<string>privoxyconf.pkg</string>
-			<key>IFPkgFlagPackageSelection</key>
-			<string>selected</string>
-		</dict>
-		<dict>
-			<key>IFPkgFlagPackageLocation</key>
 			<string>torstartup.pkg</string>
 			<key>IFPkgFlagPackageSelection</key>
 			<string>selected</string>
 		</dict>
-		<dict>
-			<key>IFPkgFlagPackageLocation</key>
-			<string>torbutton.pkg</string>
-			<key>IFPkgFlagPackageSelection</key>
-			<string>selected</string>
-		</dict>
 	</array>
         <key>IFPkgFormatVersion</key>
         <real>0.10000000149011612</real>

Modified: tor/branches/tor-0_2_0-patches/contrib/osx/TorInfo.plist.in
===================================================================
--- tor/branches/tor-0_2_0-patches/contrib/osx/TorInfo.plist.in	2008-12-02 23:47:27 UTC (rev 17458)
+++ tor/branches/tor-0_2_0-patches/contrib/osx/TorInfo.plist.in	2008-12-02 23:48:38 UTC (rev 17459)
@@ -8,7 +8,7 @@
 	<string>Tor @VERSION@</string>
 	<key>CFBundleName</key>
 	<string>Tor</string>
-	<key>CFBundleSortVersionString</key>
+	<key>CFBundleShortVersionString</key>
 	<string>@VERSION@</string>
 	<key>IFPkgFlagAllowBackRev</key>
 	<true/>

Modified: tor/branches/tor-0_2_0-patches/contrib/osx/TorStartupInfo.plist
===================================================================
--- tor/branches/tor-0_2_0-patches/contrib/osx/TorStartupInfo.plist	2008-12-02 23:47:27 UTC (rev 17458)
+++ tor/branches/tor-0_2_0-patches/contrib/osx/TorStartupInfo.plist	2008-12-02 23:48:38 UTC (rev 17459)
@@ -8,7 +8,7 @@
 	<string>Tor Startup Script</string>
 	<key>CFBundleName</key>
 	<string>Tor Startup Script</string>
-	<key>CFBundleSortVersionString</key>
+	<key>CFBundleShortVersionString</key>
 	<string>0.1</string>
 	<key>IFPkgFlagAllowBackRev</key>
 	<true/>

Modified: tor/branches/tor-0_2_0-patches/contrib/osx/uninstall_tor_bundle.sh
===================================================================
--- tor/branches/tor-0_2_0-patches/contrib/osx/uninstall_tor_bundle.sh	2008-12-02 23:47:27 UTC (rev 17458)
+++ tor/branches/tor-0_2_0-patches/contrib/osx/uninstall_tor_bundle.sh	2008-12-02 23:48:38 UTC (rev 17459)
@@ -31,7 +31,7 @@
 
 ### this is the location of a file which contains all the actual package names
 ##	(ie "Tor", "torstartup", ...) the list should be new-line-delimited.
-PACKAGE_LIST_SRC=./package_list.txt
+PACKAGE_LIST_SRC=/Library/Tor/package_list.txt
 
 ### this is the name of the user created in the install process of Tor
 TOR_USER=_tor