diff -Nru libtorrent-rasterbar-1.0.9/debian/changelog libtorrent-rasterbar-1.0.9/debian/changelog --- libtorrent-rasterbar-1.0.9/debian/changelog 2016-07-12 10:55:06.000000000 +0000 +++ libtorrent-rasterbar-1.0.9/debian/changelog 2016-07-13 10:37:41.000000000 +0000 @@ -1,8 +1,9 @@ -libtorrent-rasterbar (1.0.9-1~wily~ppa1) wily; urgency=low +libtorrent-rasterbar (1.0.9-1~wily~ppa4) wily; urgency=low * New upstream release 1.0.9 + - Add patch to revert ax_python_devel.m4 and ax_boost_python.m4 to 1.0.7 versions. - -- Calum Lind Tue, 12 Jul 2016 11:54:51 +0100 + -- Calum Lind Wed, 13 Jul 2016 11:37:30 +0100 libtorrent-rasterbar (1.0.7-1~ppa1) unstable; urgency=low diff -Nru libtorrent-rasterbar-1.0.9/debian/patches/disable_clean_b2.diff libtorrent-rasterbar-1.0.9/debian/patches/disable_clean_b2.diff --- libtorrent-rasterbar-1.0.9/debian/patches/disable_clean_b2.diff 2016-07-12 10:32:55.000000000 +0000 +++ libtorrent-rasterbar-1.0.9/debian/patches/disable_clean_b2.diff 2016-07-12 11:42:03.000000000 +0000 @@ -1,7 +1,7 @@ -Index: PPA/bindings/python/setup.py +Index: libtorrent-rasterbar-1.0.9/bindings/python/setup.py =================================================================== ---- PPA.orig/bindings/python/setup.py 2015-08-16 16:45:59.083630858 +0100 -+++ PPA/bindings/python/setup.py 2015-08-16 17:04:12.391080196 +0100 +--- libtorrent-rasterbar-1.0.9.orig/bindings/python/setup.py 2016-07-12 12:30:57.000000000 +0100 ++++ libtorrent-rasterbar-1.0.9/bindings/python/setup.py 2016-07-12 12:32:18.000000000 +0100 @@ -51,7 +51,11 @@ ext = None packages = None diff -Nru libtorrent-rasterbar-1.0.9/debian/patches/fix_py_dev_m4.diff libtorrent-rasterbar-1.0.9/debian/patches/fix_py_dev_m4.diff --- libtorrent-rasterbar-1.0.9/debian/patches/fix_py_dev_m4.diff 1970-01-01 00:00:00.000000000 +0000 +++ libtorrent-rasterbar-1.0.9/debian/patches/fix_py_dev_m4.diff 2016-07-13 09:56:40.000000000 +0000 @@ -0,0 +1,426 @@ +Index: libtorrent-rasterbar-1.0.9/m4/ax_python_devel.m4 +=================================================================== +--- libtorrent-rasterbar-1.0.9.orig/m4/ax_python_devel.m4 2016-07-13 10:55:35.617573093 +0100 ++++ libtorrent-rasterbar-1.0.9/m4/ax_python_devel.m4 2016-07-13 10:55:50.812976157 +0100 +@@ -1,5 +1,5 @@ + # =========================================================================== +-# http://www.gnu.org/software/autoconf-archive/ax_python_devel.html ++# http://www.nongnu.org/autoconf-archive/ax_python_devel.html + # =========================================================================== + # + # SYNOPSIS +@@ -12,9 +12,9 @@ + # in your configure.ac. + # + # This macro checks for Python and tries to get the include path to +-# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output +-# variables. It also exports $(PYTHON_EXTRA_LIBS) and +-# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. ++# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) ++# output variables. It also exports $(PYTHON_EXTRA_LIBS) ++# for embedding Python in your code. + # + # You can search for some particular version of Python by passing a + # parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please +@@ -34,12 +34,11 @@ + # LICENSE + # + # Copyright (c) 2009 Sebastian Huber +-# Copyright (c) 2009 Alan W. Irwin ++# Copyright (c) 2009 Alan W. Irwin + # Copyright (c) 2009 Rafael Laboissiere +-# Copyright (c) 2009 Andrew Collier ++# Copyright (c) 2009 Andrew Collier + # Copyright (c) 2009 Matteo Settenvini + # Copyright (c) 2009 Horst Knorr +-# Copyright (c) 2013 Daniel Mullner + # + # This program is free software: you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by the +@@ -67,8 +66,6 @@ + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + +-#serial 18 +- + AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) + AC_DEFUN([AX_PYTHON_DEVEL],[ + # +@@ -99,8 +96,8 @@ + This version of the AC@&t@_PYTHON_DEVEL macro + doesn't work properly with versions of Python before + 2.1.0. You may need to re-run configure, setting the +-variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, +-PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. ++variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, ++PYTHON_EXTRA_LIBS by hand. + Moreover, to disable this check, set PYTHON_NOVERSIONCHECK + to something else than an empty string. + ]) +@@ -120,7 +117,7 @@ + ver = sys.version.split ()[[0]]; \ + print (ver $1)"` + if test "$ac_supports_python_ver" = "True"; then +- AC_MSG_RESULT([yes]) ++ AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([this package requires Python $1. +@@ -136,7 +133,7 @@ + # Check if you have distutils, else fail + # + AC_MSG_CHECKING([for the distutils Python package]) +- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` ++ ac_distutils_result=`$PYTHON -c "import distutils" >/dev/null 2>&1` + if test -z "$ac_distutils_result"; then + AC_MSG_RESULT([yes]) + else +@@ -153,15 +150,9 @@ + AC_MSG_CHECKING([for Python include path]) + if test -z "$PYTHON_CPPFLAGS"; then + python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_inc ());"` +- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_inc (plat_specific=1));"` ++ print (distutils.sysconfig.get_python_inc ());"` + if test -n "${python_path}"; then +- if test "${plat_python_path}" != "${python_path}"; then +- python_path="-I$python_path -I$plat_python_path" +- else +- python_path="-I$python_path" +- fi ++ python_path="-I$python_path" + fi + PYTHON_CPPFLAGS=$python_path + fi +@@ -172,7 +163,7 @@ + # Check for Python library path + # + AC_MSG_CHECKING([for Python library path]) +- if test -z "$PYTHON_LIBS"; then ++ if test -z "$PYTHON_LDFLAGS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) + ac_python_version=`cat< ++# - Require AX_PYTHON_DEVEL to be called before this macro to properly ++# detect python include path, instead of AX_PYTHON. ++# 2009-09-07 Cristian Greco ++# - Prefix BOOST_PYTHON_LIB with a `-l` for consistency with other ++# ax_boost_libname.m4 scripts. + # + # LICENSE + # + # Copyright (c) 2008 Michael Tindal +-# Copyright (c) 2013 Daniel M"ullner + # + # This program is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by the +@@ -53,69 +59,45 @@ + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + +-#serial 21 +- + AC_DEFUN([AX_BOOST_PYTHON], + [AC_REQUIRE([AX_PYTHON_DEVEL])dnl +-AC_REQUIRE([AX_BOOST_BASE])dnl +-AC_LANG_PUSH([C++]) +-ax_boost_python_save_CPPFLAGS="$CPPFLAGS" +-ax_boost_python_save_LDFLAGS="$LDFLAGS" +-ax_boost_python_save_LIBS="$LIBS" +-if test "x$PYTHON_CPPFLAGS" != "x"; then +- CPPFLAGS="$PYTHON_CPPFLAGS $CPPFLAGS" +-fi +- +-# Versions of AX_PYTHON_DEVEL() before serial 18 provided PYTHON_LDFLAGS +-# instead of PYTHON_LIBS, so this is just here for compatibility. +-if test "x$PYTHON_LDFLAGS" != "x"; then +- LDFLAGS="$PYTHON_LDFLAGS $LDFLAGS" +-fi +- +-# Note: Only versions of AX_PYTHON_DEVEL() since serial 18 provide PYTHON_LIBS +-# instead of PYTHON_LDFLAGS. +-if test "x$PYTHON_LIBS" != "x"; then +- LIBS="$PYTHON_LIBS $LIBS" +-fi +- +-if test "x$BOOST_CPPFLAGS" != "x"; then +- CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS" +-fi +-if test "x$BOOST_LDFLAGS" != "x"; then +- LDFLAGS="$BOOST_LDFLAGS $LDFLAGS" +-fi + AC_CACHE_CHECK(whether the Boost::Python library is available, + ac_cv_boost_python, +-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +-#include +-BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]], [])], +- ac_cv_boost_python=yes, ac_cv_boost_python=no) ++[AC_LANG_SAVE ++ AC_LANG_CPLUSPLUS ++ CPPFLAGS_SAVE=$CPPFLAGS ++ if test "x$PYTHON_CPPFLAGS" != "x"; then ++ CPPFLAGS="$PYTHON_CPPFLAGS $CPPFLAGS" ++ fi ++ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ ++ #include ++ using namespace boost::python; ++ BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]], ++ [[return 0;]]), ++ ac_cv_boost_python=yes, ac_cv_boost_python=no) ++ AC_LANG_RESTORE ++ CPPFLAGS=$CPPFLAGS_SAVE + ]) +-if test "$ac_cv_boost_python" = "yes"; then +- AC_DEFINE(HAVE_BOOST_PYTHON,,[define if the Boost::Python library is available]) ++if test "x$ac_cv_boost_python" = "xyes"; then ++ AC_DEFINE(HAVE_BOOST_PYTHON,[1],[define if the Boost::Python library is available]) ++ dnl ++ LDFLAGS_SAVE=$LDFLAGS ++ if test "x$PYTHON_LDFLAGS" != "x"; then ++ LDFLAGS="$LDFLAGS $PYTHON_LDFLAGS" ++ fi ++ dnl + ax_python_lib=boost_python +- AC_ARG_WITH([boost-python],AS_HELP_STRING([--with-boost-python],[specify yes/no or the boost python library or suffix to use]), +- [if test "x$with_boost_python" != "xno" -a "x$with_boost_python" != "xyes"; then +- ax_python_lib=$with_boost_python +- ax_boost_python_lib=boost_python-$with_boost_python ++ AC_ARG_WITH([boost-python],AS_HELP_STRING([--with-boost-python],[specify the boost python library or suffix to use]), ++ [if test "x$with_boost_python" != "xno"; then ++ ax_python_lib="$with_boost_python" ++ ax_boost_python_lib="boost_python-$with_boost_python" + fi]) +- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` +- for ax_lib in $ax_python_lib $ax_boost_python_lib `ls $BOOSTLIBDIR/libboost_python*.so* $BOOSTLIBDIR/libboost_python*.dylib* $BOOSTLIBDIR/libboost_python*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_python.*\)\.so.*$;\1;' -e 's;^lib\(boost_python.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_python.*\)\.a.*$;\1;' ` boost_python boost_python3; do +- AS_VAR_PUSHDEF([ax_Lib], [ax_cv_lib_$ax_lib''_BOOST_PYTHON_MODULE])dnl +- AC_CACHE_CHECK([whether $ax_lib is the correct library], [ax_Lib], +- [LIBS="-l$ax_lib $ax_boost_python_save_LIBS $PYTHON_LIBS" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +-#include +-BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]], [])], +- [AS_VAR_SET([ax_Lib], [yes])], +- [AS_VAR_SET([ax_Lib], [no])])]) +- AS_VAR_IF([ax_Lib], [yes], [BOOST_PYTHON_LIB=$ax_lib break], []) +- AS_VAR_POPDEF([ax_Lib])dnl ++ for ax_lib in $ax_python_lib $ax_boost_python_lib boost_python; do ++ AC_CHECK_LIB($ax_lib, main, [BOOST_PYTHON_LIB=-l$ax_lib break]) + done ++ dnl ++ LDFLAGS=$LDFLAGS_SAVE ++ dnl + AC_SUBST(BOOST_PYTHON_LIB) + fi +-CPPFLAGS="$ax_boost_python_save_CPPFLAGS" +-LDFLAGS="$ax_boost_python_save_LDFLAGS" +-LIBS="$ax_boost_python_save_LIBS" +-AC_LANG_POP([C++]) + ])dnl +Index: libtorrent-rasterbar-1.0.9/configure.ac +=================================================================== +--- libtorrent-rasterbar-1.0.9.orig/configure.ac 2016-02-28 07:24:18.000000000 +0000 ++++ libtorrent-rasterbar-1.0.9/configure.ac 2016-07-13 10:56:33.738552110 +0100 +@@ -564,7 +564,6 @@ + AS_IF([test -z "$BOOST_PYTHON_LIB"], + [AC_MSG_ERROR([Boost.Python library not found. Try using --with-boost-python=lib.])]) + +- BOOST_PYTHON_LIB="-l$BOOST_PYTHON_LIB" + ], + ["no"], [ + AC_MSG_RESULT([no]) +@@ -832,7 +831,7 @@ + OpenSSL Libs: ${OPENSSL_LIBS} + OpenSSL LDFlags: ${OPENSSL_LDFLAGS} + OpenSSL Includes: ${OPENSSL_INCLUDES} +-END ++END + ]) + + cat config.report diff -Nru libtorrent-rasterbar-1.0.9/debian/patches/series libtorrent-rasterbar-1.0.9/debian/patches/series --- libtorrent-rasterbar-1.0.9/debian/patches/series 2016-07-12 10:32:55.000000000 +0000 +++ libtorrent-rasterbar-1.0.9/debian/patches/series 2016-07-12 11:07:43.000000000 +0000 @@ -1 +1,2 @@ +fix_py_dev_m4.diff disable_clean_b2.diff