commit 8e6f23293f2f1d59c982c91f8b74fe0bd47f6ca0 Author: David Fifield david@bamsoftware.com Date: Wed Dec 12 13:18:25 2012 -0800

Install ChangeLog as a doc file. --- Makefile | 2 +- doc/bundle-gnulinux.txt | 2 +- doc/bundle-macosx.txt | 2 +- doc/bundle-windows.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile index 087e23d..7909f23 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ export PYINSTALLER_TMPDIR = pyinstaller-tmp

CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 -CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE torrc +CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE ChangeLog torrc CLIENT_DIST_DOC_FILES = $(CLIENT_MAN) doc/LICENSE.GPL doc/LICENSE.PYTHON

all: $(CLIENT_DIST_FILES) $(CLIENT_MAN) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index e8d8a35..79f5584 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -95,7 +95,7 @@ Copy files into the bundle. $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} App $ cp -r /usr/lib/pymodules/python2.6/M2Crypto App $ mkdir -p Docs/FlashProxy - $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE} Docs/FlashProxy + $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy

Make the second half of Data/Tor/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff). diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index 583920f..f9cfd33 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -62,7 +62,7 @@ Copy files into the bundle. $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} Contents/MacOS $ cp -r ~/bundle/usr/lib/python2.7/site-packages/M2Crypto Contents/MacOS $ mkdir -p Contents/Resources/Docs/FlashProxy - $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE} Contents/Resources/Docs/FlashProxy + $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE,ChangeLog} Contents/Resources/Docs/FlashProxy

Make the second half of Library/Vidalia/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff). diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index 181f2d4..e1d0513 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -35,7 +35,7 @@ from being overwritten.

$ cp -n ~/flashproxy/dist/flashproxy-client-VERSION-win32/{*.pyd,*.dll,*.exe,*.manifest} App $ mkdir -p Docs/FlashProxy - $ cp ~/flashproxy/dist/flashproxy-client-VERSION-win32/{doc/*,README,LICENSE} Docs/FlashProxy + $ cp ~/flashproxy/dist/flashproxy-client-VERSION-win32/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy

Make the second half of Data/Tor/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff).