bump version to 1.2.5

arvidn · Mar 8, 2020 · 0f337b9 · 0f337b9
1 parent eaa18ff
commit 0f337b9
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 10 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,5 @@
+1.2.5 release
+
 	* announce port=1 instead of port=0, when there is no listen port
 	* fix LSD over IPv6
 	* support TCP_NOTSENT_LOWAT on Linux

diff --git a/Jamfile b/Jamfile
@@ -45,7 +45,7 @@ else
 		: : $(boost-include-path) <include>/usr/local/include ;
 }
 
-VERSION = 1.2.4 ;
+VERSION = 1.2.5 ;
 
 rule linking ( properties * )
 {

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
@@ -182,7 +182,7 @@ def target_specific():
 
 setup(
     name='python-libtorrent',
-    version='1.2.4',
+    version='1.2.5',
     author='Arvid Norberg',
     author_email='[email protected]',
     description='Python bindings for libtorrent-rasterbar',

diff --git a/build_dist.sh b/build_dist.sh
@@ -16,7 +16,7 @@ chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp
 ./configure --enable-python-binding --enable-examples=yes --enable-encryption --enable-tests=yes
 make dist
 
-VERSION=1.2.4
+VERSION=1.2.5
 
 tar xvzf libtorrent-rasterbar-${VERSION}.tar.gz
 cd libtorrent-rasterbar-${VERSION}/test

diff --git a/configure.ac b/configure.ac
@@ -5,7 +5,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([libtorrent-rasterbar],[1.2.4],[[email protected]],
+AC_INIT([libtorrent-rasterbar],[1.2.5],[[email protected]],
         [libtorrent-rasterbar],[http://www.libtorrent.org])
 AC_CONFIG_SRCDIR([src/torrent.cpp])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/docs/header.rst b/docs/header.rst
@@ -1,3 +1,3 @@
 :Author: Arvid Norberg, [email protected]
-:Version: 1.2.4
+:Version: 1.2.5
 
diff --git a/docs/hunspell/libtorrent.dic b/docs/hunspell/libtorrent.dic
@@ -546,7 +546,7 @@ cpp
 tos
 BP
 qB
-LT1240
+LT1250
 iocontrol
 getname
 getpeername

diff --git 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 2
-#define LIBTORRENT_VERSION_TINY 4
+#define LIBTORRENT_VERSION_TINY 5
 
 // 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.2.4.0"
-#define LIBTORRENT_REVISION "9344dcc9b"
+#define LIBTORRENT_VERSION "1.2.5.0"
+#define LIBTORRENT_REVISION "9469913cb"
 
 namespace libtorrent {
 

diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp
@@ -124,7 +124,7 @@ constexpr int CLOSE_FILE_INTERVAL = 0;
 		SET(proxy_username, "", &session_impl::update_proxy),
 		SET(proxy_password, "", &session_impl::update_proxy),
 		SET(i2p_hostname, "", &session_impl::update_i2p_bridge),
-		SET(peer_fingerprint, "-LT1240-", nullptr),
+		SET(peer_fingerprint, "-LT1250-", nullptr),
 		SET(dht_bootstrap_nodes, "dht.libtorrent.org:25401", &session_impl::update_dht_bootstrap_nodes)
 	}});
-Original file line number
+Diff line change
@@ Expand Up / @@ -546,7 +546,7 @@ cpp @@
     tos
     BP
     qB
-    LT1240
+    LT1250
     iocontrol
     getname
     getpeername
@@ Expand Down @@