(trunk) bump to 1.61

diff --git a/NEWS b/NEWS
index e50e0d214e4afa100ff2b5740cae2f0c997406dc..d2f6785f96cd66b26ae94240c45cef6670117174 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,11 +7,11 @@ NEWS file for Transmission <http://www.transmissionbt.com/>
    + Fix locale error in the JSON parser
 - Qt
    + Various small bugfixes to the beta Qt client
-- Daemon
-   + transmission-remote was unable to select torrents by their SHA1 hash
 - Web Client
    + Fix 1.60 error that failed to serve Web Client files on some embedded platforms
    + Add response header that allows static files to be cached on the client side
+- Daemon
+   + transmission-remote was unable to select torrents by their SHA1 hash
 
 1.53 (2009/05/11)
 - All Platforms

diff --git a/configure.ac b/configure.ac
index 2c010d41581699a496bfcaf8ed46b141b954358d..5cc108a51c6c9753b1fea0a15b73b17d69ac8d58 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ dnl STATUS: "X" for prerelease beta builds,
 dnl         "Z" for unsupported trunk builds,
 dnl         "0" for stable, supported releases
 dnl these should be the only two lines you need to change
-m4_define([user_agent_prefix],[1.60+])
-m4_define([peer_id_prefix],[-TR160Z-])
+m4_define([user_agent_prefix],[1.61])
+m4_define([peer_id_prefix],[-TR1610-])
 
 AC_INIT([transmission],
         [user_agent_prefix],

diff --git a/macosx/version.sh b/macosx/version.sh
index 9bac8a442ce6c7672872f56c661fba8bfd944167..91b78dcbb367c6ac30465806772d95c425e2a362 100755 (executable)
--- a/macosx/version.sh
+++ b/macosx/version.sh
@@ -7,8 +7,8 @@
 #         "Z" for unsupported trunk builds,
 #         "0" for stable, supported releases
 # these should be the only two lines you need to change
-PEERID_PREFIX="-TR160Z-"
-USERAGENT_PREFIX="1.60+"
+PEERID_PREFIX="-TR1610-"
+USERAGENT_PREFIX="1.61"
 
 SVN_REVISION=`find -E ./libtransmission ./macosx                     \
                   -regex ".*\.([chmp]|cpp|po|sh)"                    \