diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f4e8c0f9..340e38f8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6) project(libtorrent) set (SOVERSION "8") -set (VERSION "1.1.3") +set (VERSION "1.1.4") set(sources web_connection_base diff --git a/ChangeLog b/ChangeLog index 98f8237de..ed815d253 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.1.4 release + * corrected missing const qualifiers on bdecode_node * fix changing queue position of paused torrents (1.1.3 regression) * fix re-check issue after move_storage diff --git a/Jamfile b/Jamfile index 9965427ac..99fcb5e65 100644 --- a/Jamfile +++ b/Jamfile @@ -58,7 +58,7 @@ else : : $(boost-include-path) ; } -VERSION = 1.1.3 ; +VERSION = 1.1.4 ; # rule for linking the correct libraries depending # on features and target-os diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 49a608de7..4692551e8 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -133,7 +133,7 @@ else: libraries = ['torrent-rasterbar'] + flags.libraries)] setup(name = 'python-libtorrent', - version = '1.1.3', + version = '1.1.4', author = 'Arvid Norberg', author_email = 'arvid@libtorrent.org', description = 'Python bindings for libtorrent-rasterbar', diff --git a/build_dist.sh b/build_dist.sh index cc684e0af..3a7f67ddc 100755 --- a/build_dist.sh +++ b/build_dist.sh @@ -3,7 +3,8 @@ make clean cd docs -make RST2HTML=rst2html-3.4.py +make clean +make RST2HTML=rst2html.py cd .. #clear out any extended attributes that Finder may add diff --git a/configure.ac b/configure.ac index 5a9deac97..6681a3936 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.63]) -AC_INIT([libtorrent-rasterbar],[1.1.3],[arvid@libtorrent.org], +AC_INIT([libtorrent-rasterbar],[1.1.4],[arvid@libtorrent.org], [libtorrent-rasterbar],[http://www.libtorrent.org]) AC_CONFIG_SRCDIR([src/torrent.cpp]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/docs/building.rst b/docs/building.rst index 6c915f625..59963d9a6 100644 --- a/docs/building.rst +++ b/docs/building.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/contributing.rst b/docs/contributing.rst index 9e4e23324..7e3f3765d 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_rss.rst b/docs/dht_rss.rst index e79512366..c69745e84 100644 --- a/docs/dht_rss.rst +++ b/docs/dht_rss.rst @@ -3,7 +3,7 @@ BitTorrent extension for DHT RSS feeds ====================================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_sec.rst b/docs/dht_sec.rst index 7639c44b4..efac89f5b 100644 --- a/docs/dht_sec.rst +++ b/docs/dht_sec.rst @@ -3,7 +3,7 @@ BitTorrent DHT security extension ================================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_store.rst b/docs/dht_store.rst index 1704255a5..462f296ad 100644 --- a/docs/dht_store.rst +++ b/docs/dht_store.rst @@ -3,7 +3,7 @@ BitTorrent extension for arbitrary DHT store ============================================ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/examples.rst b/docs/examples.rst index d066a42d8..fda2b7f3c 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -3,7 +3,7 @@ libtorrent Examples =================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/features.rst b/docs/features.rst index 9a0a67707..e62bdf919 100644 --- a/docs/features.rst +++ b/docs/features.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/gen_reference_doc.py b/docs/gen_reference_doc.py index bedb335e8..f7074f6dc 100644 --- a/docs/gen_reference_doc.py +++ b/docs/gen_reference_doc.py @@ -1027,7 +1027,7 @@ for cat in categories: out.write(''' :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 `home`__ diff --git a/docs/hacking.rst b/docs/hacking.rst index 8e48cec5d..65e7134db 100644 --- a/docs/hacking.rst +++ b/docs/hacking.rst @@ -3,7 +3,7 @@ libtorrent hacking ================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/index.rst b/docs/index.rst index 962dfddb1..03c36b8ed 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,5 +1,5 @@ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. raw:: html diff --git a/docs/manual.rst b/docs/manual.rst index 3910cf41a..8af8a35fb 100644 --- a/docs/manual.rst +++ b/docs/manual.rst @@ -3,7 +3,7 @@ libtorrent API Documentation ============================ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 1 diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index e2682f878..44d6eb69a 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/tuning.rst b/docs/tuning.rst index c8dbe2eeb..ee3703608 100644 --- a/docs/tuning.rst +++ b/docs/tuning.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 6f3a5607f..5df3b6f7e 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 2 diff --git a/docs/utp.rst b/docs/utp.rst index 3c12ab4fb..469dbdb71 100644 --- a/docs/utp.rst +++ b/docs/utp.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.3 +:Version: 1.1.4 .. contents:: Table of contents :depth: 2 diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp index edda9e46b..6449f2689 100644 --- a/include/libtorrent/version.hpp +++ b/include/libtorrent/version.hpp @@ -37,14 +37,14 @@ POSSIBILITY OF SUCH DAMAGE. #define LIBTORRENT_VERSION_MAJOR 1 #define LIBTORRENT_VERSION_MINOR 1 -#define LIBTORRENT_VERSION_TINY 3 +#define LIBTORRENT_VERSION_TINY 4 // the format of this version is: MMmmtt // M = Major version, m = minor version, t = tiny version #define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTORRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY) -#define LIBTORRENT_VERSION "1.1.3.0" -#define LIBTORRENT_REVISION "6afb0fd" +#define LIBTORRENT_VERSION "1.1.4.0" +#define LIBTORRENT_REVISION "20c1407" namespace libtorrent { diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp index 84352fc40..0b9c9aa55 100644 --- a/src/settings_pack.cpp +++ b/src/settings_pack.cpp @@ -148,7 +148,7 @@ namespace libtorrent SET_NOPREV(proxy_username, "", &session_impl::update_proxy), SET_NOPREV(proxy_password, "", &session_impl::update_proxy), SET_NOPREV(i2p_hostname, "", &session_impl::update_i2p_bridge), - SET_NOPREV(peer_fingerprint, "-LT1130-", &session_impl::update_peer_fingerprint), + SET_NOPREV(peer_fingerprint, "-LT1140-", &session_impl::update_peer_fingerprint), SET_NOPREV(dht_bootstrap_nodes, "dht.libtorrent.org:25401", &session_impl::update_dht_bootstrap_nodes) };