fix building tarball

ChangeLog

@@ -1,3 +1,5 @@
+1.2 release
+
 	* renamed debug_notification to connect_notification
 	* when updating listen sockets, only post alerts for new ones
 	* deprecate anonymous_mode_alert

Makefile.am

@@ -87,6 +87,7 @@ DOCS_PAGES = \
   docs/tutorial.rst               \
   docs/header.rst                 \
   docs/tutorial.html              \
+  docs/upgrade_to_1.2-ref.html    \
   docs/reference-Alerts.html      \
   docs/reference-Bdecoding.html   \
   docs/reference-Bencoding.html   \

build_dist.sh

@@ -6,16 +6,16 @@ set -x
 python tools/clean.py
 
 cd docs
-make RST2HTML=rst2html-2.7.py
+make
 cd ..
 
 rm -f m4/libtool.m4 m4/lt~obsolete.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/ltoptions.m4
 chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp
 
 ./autotool.sh
-./configure --enable-python-binding --enable-examples=yes --enable-encryption --enable-tests=yes --with-boost-system=mt --with-boost-chrono=mt --with-boost-random=mt --with-boost-python=mt --with-openssl=/usr/local/opt/openssl
+./configure --enable-python-binding --enable-examples=yes --enable-encryption --enable-tests=yes
-make V=1 -j8 check
+make V=1 -j16 check
 
-./configure --enable-python-binding --enable-examples=yes --enable-encryption --with-boost-system=mt --with-boost-chrono=mt --with-boost-random=mt --with-boost-python=mt --with-openssl=/usr/local/opt/openssl
+./configure --enable-python-binding --enable-examples=yes --enable-encryption
-make V=1 -j8 dist
+make V=1 -j16 dist
 

docs/projects.rst

@@ -12,7 +12,7 @@ Wyzo
 
 wyzo_ is a media browser with built-in bittorrent support.
 
-.. _wyzo: http://www.wyzo.com/
+.. _wyzo: http://wyzo.findmysoft.com/#
 
 deluge
 ------
@@ -95,7 +95,7 @@ interfaces which connects to the daemon. One GUI (Gtkmm), one terminal
 interface (ncurses) and one web interface (accessable through a web browser).
 Written by Michael Wojciechowski and Johan Strom.
 
-.. _btg: http://btg.berlios.de//
+.. _btg: https://sourceforge.net/projects/btg/
 
 electric sheep
 --------------
@@ -111,7 +111,7 @@ Tvitty
 tvitty_ is a bittorrent client for Vista Media Center, which allows
 searching and downloading of torrents directly on your TV.
 
-.. _tvitty: http://tvitty.com
+.. _tvitty: https://tvitty.soft112.com/
 
 hrktorrent
 ----------
@@ -144,7 +144,7 @@ Arctic Torrent
 bittorrent client for windows.
 Written by Cory Nelson.
 
-.. _`Arctic Torrent`: http://www.int64.org/arctic.html
+.. _`Arctic Torrent`: https://www.softpedia.com/get/Internet/File-Sharing/Arctic-Torrent.shtml
 
 bubba
 -----
@@ -153,7 +153,7 @@ Bubba_ is a mini-sized server, designed to fit your home better than
 an always running PC. Boasting Torrent downloader, DAAP streaming,
 Web, E-mail, printer and FTP server etc.
 
-.. _Bubba: http://excito.com/bubba/about-bubba.html
+.. _Bubba: https://excitostore.com/
 
 tvblob
 ------
@@ -165,7 +165,7 @@ like surfing the web.
 This means that anyone will have the ability to reach viewers via the Internet
 directly on TV, without them having to connect a PC.
 
-.. _BLOBbox: http://www.tvblob.com
+.. _BLOBbox: https://www.reviewed.com/cameras/news/blobbox-by-tvblob-20479
 
 Flush
 -----
@@ -183,20 +183,6 @@ featured client.
 
 .. _Lince: http://lincetorrent.sourceforge.net/
 
-Linkage
--------
-
-Linkage_ is a gtkmm client that aims to be middle weight.
-
-.. _Linkage: http://code.google.com/p/linkage/
-
-Bitfox
-------
-
-Bitfox_ is a firefox plugin integrating bittorrent downloads in firefox.
-
-.. _Bitfox: http://code.google.com/p/bitfox/
-
 BitSlug
 -------
 
@@ -230,5 +216,5 @@ home theater system, while the built in download manager can automatically
 download video and audio podcasts as well as allow you to download bittorrent
 files without needing to leave your computer on.
 
-.. _ZyXEL: http://us.zyxel.com/Products/details.aspx?PC1IndexFlag=20050125090459&CategoryGroupNo=758BFE64-3A95-463C-9E1E-3D30E3B58D9C
+.. _ZyXEL: https://www.zyxel.com/uk/en/products_services/nsa_220_plus.shtml
 

docs/upgrade_to_1.2.rst

@@ -56,7 +56,7 @@ The setting ``rate_limit_utp`` was deprecated in libtorrent 1.1.
 When building without deprecated features (``deprecated-functions=off``) the default behavior also changed to have rate limits apply to utp sockets too.
 In order to be more consistent between the two build configurations, the default value has changed to true.
 The new mechanism provided to apply special rate limiting rules is *peer classes*.
-In order to implement the old behavior of not rate limiting uTP peers, one cans set up a peer class for all uTP peers, to make the normal peer classes not apply to them (which is where the rate limits are set).
+In order to implement the old behavior of not rate limiting uTP peers, one can set up a peer class for all uTP peers, to make the normal peer classes not apply to them (which is where the rate limits are set).
 
 announce entry multi-home support
 =================================
@@ -139,7 +139,7 @@ plugins
 =======
 
 libtorrent session plugins no longer have all callbacks called unconditionally.
-The callback has to register which callbacks it's interested in receiving by returning a bitmask from ``feature_flags_t implemented_features()``.
+The plugin has to register which callbacks it's interested in receiving by returning a bitmask from ``feature_flags_t implemented_features()``.
 The return value is documented in the plugin class.
 
 RSS functions removed

examples/Makefile.am

@@ -14,7 +14,7 @@ bin_PROGRAMS = $(example_programs)
 endif
 
 EXTRA_PROGRAMS = $(example_programs)
-EXTRA_DIST = Jamfile CMakeLists.txt run_cmake.sh.in session_view.hpp torrent_view.hpp print.hpp cmake/FindLibtorrentRasterbar.cmake
+EXTRA_DIST = Jamfile CMakeLists.txt session_view.hpp torrent_view.hpp print.hpp cmake/FindLibtorrentRasterbar.cmake
 
 client_test_SOURCES = client_test.cpp print.cpp session_view.cpp torrent_view.cpp
 stats_counters_SOURCES = stats_counters.cpp