commit 92c2a816caa72ae4e3cdc09abcef43f3fc085e84 Author: Erinn Clark <erinn@torproject.org> Date: Sat Dec 14 17:46:26 2013 -0200 fix changelog and README versions in build scripts --- build-scripts/linux-alpha.mk | 4 ++-- build-scripts/linux.mk | 4 ++-- build-scripts/osx-alpha.mk | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/windows-alpha.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 3f831dd..72d4b0a 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -289,9 +289,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.linux-2.4 $(DOCSDIR)/changelog + cp ../changelog.linux-2.5 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-2.4 $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-2.5 $(DOCSDIR)/README-TorBrowserBundle ifeq ($(USE_OBFSPROXY),1) mkdir -p $(DOCSDIR)/Obfsproxy cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 300357f..d5e82b0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -268,9 +268,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.linux-2.3 $(DOCSDIR)/changelog + cp ../changelog.linux-2.4 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-2.4 $(DOCSDIR)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 00bc7aa..b9d2cce 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -310,9 +310,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.osx-2.4 $(DOCSDIR)/changelog + cp ../changelog.osx-2.5 $(DOCSDIR)/changelog cp ../LICENSE $(DEST) - cp ../README.OSX-2.4 $(DEST)/README-TorBrowserBundle + cp ../README.OSX-2.5 $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 4246dc3..36120ae 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -264,9 +264,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.osx-2.3 $(DOCSDIR)/changelog + cp ../changelog.osx-2.4 $(DOCSDIR)/changelog cp ../LICENSE $(DEST) - cp ../README.OSX-2.3 $(DEST)/README-TorBrowserBundle + cp ../README.OSX-2.4 $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index da4af92..d087ac2 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -294,8 +294,8 @@ install-docs: cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.windows-2.4 $(DOCSDIR)/changelog - cp ../README.WIN-2.4 $(DOCSDIR)/README-TorBrowserBundle + cp ../changelog.windows-2.5 $(DOCSDIR)/changelog + cp ../README.WIN-2.5 $(DOCSDIR)/README-TorBrowserBundle ifeq ($(USE_OBFSPROXY),1) mkdir -p $(DOCSDIR)/Obfsproxy cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 9b4a557..d7ff4d3 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -265,8 +265,8 @@ install-docs: cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.windows-2.3 $(DOCSDIR)/changelog - cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle + cp ../changelog.windows-2.4 $(DOCSDIR)/changelog + cp ../README.WIN-2.4 $(DOCSDIR)/README-TorBrowserBundle ## Copy over FirefoxPortable install-firefoxportable: