Update some copyrights, change net.freehaven to org.torproject.

svn:r18514

diff --git a/contrib/osx/TorBundleInfo.plist.in b/contrib/osx/TorBundleInfo.plist.in
index 61b4f8368bf45cdf0c59e8ce0bfb85c4b0a5b037..c7f497f39244682e98d2a02cd4a48521b5624030 100644 (file)
--- 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>CFBundleShortVersionString</key>
        <string>@VERSION@</string>
        <key>IFPkgFlagComponentDirectory</key>

diff --git a/contrib/osx/TorPreFlight b/contrib/osx/TorPreFlight
index f84f3167a8f35a690fc7c94dfc54335768dc9a38..69dff3c1fd2c5c83aa68410c3196633a8bd096c0 100644 (file)
--- a/contrib/osx/TorPreFlight
+++ b/contrib/osx/TorPreFlight
@@ -5,7 +5,7 @@
 # TorPreFlight is distributed under this license:
 #
 # Copyright (c) 2006 Andrew Lewman
-# Copyright (c) 2008 The Tor Project
+# Copyright (c) 2008 The Tor Project, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are

diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index 805e77ec247a50f7681f6d559388ff23a8fa976b..040c7cd4c9bad886d12f8f7ab2697d36c4f7871f 100644 (file)
--- a/contrib/osx/package.sh
+++ b/contrib/osx/package.sh
@@ -2,12 +2,12 @@
 # $Id$
 # Copyright 2004-2005 Nick Mathewson. 
 # Copyright 2005-2007 Andrew Lewman
-# Copyright 2008 The Tor Project
+# Copyright 2008 The Tor Project, Inc.
 # See LICENSE in Tor distribution for licensing information.
 
 # This script builds a Macintosh OS X metapackage containing 2 packages:
 #    - One for Tor.
-#    - One for Startup scripts for Tor.
+#    - One for Startup script for Tor.
 #
 # This script expects to be run from the toplevel makefile, with VERSION
 # set to the latest Tor version, and Tor already built.
@@ -94,15 +94,7 @@ cp AUTHORS $DOC/AUTHORS.txt
 groff doc/tor.1.in -T ps -m man | pstopdf -i -o $DOC/tor-reference.pdf
 groff doc/tor-resolve.1 -T ps -m man | pstopdf -i -o $DOC/tor-resolve.pdf
 mkdir $DOC/Advanced
-cp     doc/spec/tor-spec.txt         \
-       doc/spec/rend-spec.txt        \
-       doc/spec/control-spec.txt     \
-       doc/spec/socks-extensions.txt \
-       doc/spec/version-spec.txt     \
-       doc/spec/address-spec.txt     \
-       doc/spec/path-spec.txt        \
-       $DOC/Advanced
-
+cp doc/spec/*.txt $DOC/Advanced
 cp doc/HACKING $DOC/Advanced/HACKING.txt
 cp ChangeLog $DOC/Advanced/ChangeLog.txt