diff -Nru transmission-2.92/debian/changelog transmission-2.92/debian/changelog --- transmission-2.92/debian/changelog 2016-03-10 06:01:58.000000000 +0000 +++ transmission-2.92/debian/changelog 2016-03-12 10:31:40.000000000 +0000 @@ -1,4 +1,10 @@ -transmission (2.92-0ubuntu0.15.10.6~15.10.1) wily; urgency=medium +transmission (2.92-0ubuntu0.15.10.7~15.10.1) wily; urgency=medium + + * disable external lib downloads + + -- Andreas Roth Sat, 12 Mar 2016 11:26:53 +0100 + +transmission (2.92-0ubuntu0.15.10.6) wily; urgency=medium * fixed libsystemd-daemon-dev diff -Nru transmission-2.92/debian/patches/disable_external_project_download.diff transmission-2.92/debian/patches/disable_external_project_download.diff --- transmission-2.92/debian/patches/disable_external_project_download.diff 1970-01-01 00:00:00.000000000 +0000 +++ transmission-2.92/debian/patches/disable_external_project_download.diff 2016-03-12 10:30:23.000000000 +0000 @@ -0,0 +1,118 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -192,12 +192,15 @@ + set(QT5_REQUIRED_MODULES Core Gui Widgets Network LinguistTools) + set(QT5_OPTIONAL_MODULES DBus AxContainer AxServer) + foreach(M ${QT5_REQUIRED_MODULES}) +- find_package(Qt5${M} QUIET) ++ #find_package(Qt5${M} QUIET) ++ find_package(Qt5${M}) + if(Qt5${M}_FOUND) ++ message(STATUS "Found Qt5${M}") + if(NOT M STREQUAL "LinguistTools") + list(APPEND QT_TARGETS Qt5::${M}) + endif() + else() ++ message(STATUS "Did not find Qt5${M}") + set(QT_TARGETS) + break() + endif() +@@ -206,13 +209,16 @@ + foreach(M ${QT5_OPTIONAL_MODULES}) + find_package(Qt5${M} QUIET) + if(Qt5${M}_FOUND) ++ message(STATUS "Found Qt5${M} optional") + list(APPEND QT_TARGETS Qt5::${M}) + endif() + endforeach() + if(Qt5AxContainer_FOUND AND Qt5AxServer_FOUND) ++ message(STATUS "Found Qt5 Ax optional") + set(ENABLE_QT_COM_INTEROP ON) + endif() + if(Qt5DBus_FOUND) ++ message(STATUS "Found Qt5 dbus optional") + set(ENABLE_QT_DBUS_INTEROP ON) + endif() + endif() +@@ -255,6 +261,9 @@ + set(QT_FOUND ON) + if(NOT QT_TARGETS OR NOT (ENABLE_QT_COM_INTEROP OR ENABLE_QT_DBUS_INTEROP)) + if(QT_IS_REQUIRED) ++ message(STATUS "QT_TARGETS=${QT_TARGETS}") ++ message(STATUS "ENABLE_QT_COM_INTEROP=${ENABLE_QT_COM_INTEROP}") ++ message(STATUS "ENABLE_QT_DBUS_INTEROP=${ENABLE_QT_DBUS_INTEROP}") + message(FATAL_ERROR "Unable to find required Qt libraries.") + endif() + set(QT_FOUND OFF) +@@ -313,16 +322,18 @@ + if(ENABLE_UTP) + tr_add_external_auto_library(UTP utp + PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${THIRD_PARTY_DIR}/utp.cmake" "/CMakeLists.txt" +- COMMAND "${CMAKE_COMMAND}" -E copy "${THIRD_PARTY_DIR}/utp_config.h" "/utp_config.h" +- COMMAND "${CMAKE_COMMAND}" -E chdir "" patch -p1 --binary -i "${THIRD_PARTY_DIR}/utp-01-ticket-5002.patch" +- COMMAND "${CMAKE_COMMAND}" -E chdir "" patch -p1 --binary -i "${THIRD_PARTY_DIR}/utp-02-win32.patch" +- COMMAND "${CMAKE_COMMAND}" -E chdir "" patch -p1 --binary -i "${THIRD_PARTY_DIR}/utp-03-msvc14.patch") ++ #COMMAND "${CMAKE_COMMAND}" -E copy "${THIRD_PARTY_DIR}/utp_config.h" "/utp_config.h" ++ #COMMAND "${CMAKE_COMMAND}" -E chdir "" patch -p1 --binary -i "${THIRD_PARTY_DIR}/utp-01-ticket-5002.patch" ++ #COMMAND "${CMAKE_COMMAND}" -E chdir "" patch -p1 --binary -i "${THIRD_PARTY_DIR}/utp-02-win32.patch" ++ #COMMAND "${CMAKE_COMMAND}" -E chdir "" patch -p1 --binary -i "${THIRD_PARTY_DIR}/utp-03-msvc14.patch" ++ ) + endif() + + tr_add_external_auto_library(B64 b64 + PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${THIRD_PARTY_DIR}/b64.cmake" "/CMakeLists.txt" +- COMMAND "${CMAKE_COMMAND}" -E chdir "" patch -p1 -i "${THIRD_PARTY_DIR}/b64-01-newline.patch" +- COMMAND "${CMAKE_COMMAND}" -E chdir "" patch -p1 -i "${THIRD_PARTY_DIR}/b64-02-unsigned-char.patch") ++ #COMMAND "${CMAKE_COMMAND}" -E chdir "" patch -p1 -i "${THIRD_PARTY_DIR}/b64-01-newline.patch" ++ #COMMAND "${CMAKE_COMMAND}" -E chdir "" patch -p1 -i "${THIRD_PARTY_DIR}/b64-02-unsigned-char.patch" ++ ) + + if(WITH_INOTIFY) + tr_get_required_flag(WITH_INOTIFY INOTIFY_IS_REQUIRED) +--- a/cmake/TrMacros.cmake ++++ b/cmake/TrMacros.cmake +@@ -89,6 +89,13 @@ + else() + set(${ID}_UPSTREAM_TARGET ${LIBNAME}-${${ID}_RELEASE}) + set(${ID}_PREFIX "${CMAKE_BINARY_DIR}/third-party/${${ID}_UPSTREAM_TARGET}") ++ message(STATUS "${ID}_UPSTREAM=${${ID}_UPSTREAM}") ++ if(EXISTS ${CMAKE_SOURCE_DIR}/third-party/${LIBNAME}) ++ set(${ID}_UPSTREAM SOURCE_DIR "${CMAKE_SOURCE_DIR}/third-party/${LIBNAME}") ++ else() ++ set(${ID}_UPSTREAM SOURCE_DIR "${CMAKE_SOURCE_DIR}/third-party/lib${LIBNAME}") ++ endif() ++ message(STATUS "${ID}_UPSTREAM=${${ID}_UPSTREAM}") + + ExternalProject_Add( + ${${ID}_UPSTREAM_TARGET} +@@ -111,6 +118,11 @@ + + set(${ID}_INCLUDE_DIRS ${${ID}_INCLUDE_DIR}) + set(${ID}_LIBRARIES ${${ID}_LIBRARY}) ++ ++ message(STATUS "${ID}_INCLUDE_DIR=${${ID}_INCLUDE_DIR}") ++ message(STATUS "${ID}_LIBRARY=${${ID}_LIBRARY}") ++ message(STATUS "${ID}_PREFIX=${${ID}_PREFIX}") ++ + endif() + endmacro() + +--- a/third-party/b64.cmake ++++ b/third-party/b64.cmake +@@ -1,12 +1,12 @@ + cmake_minimum_required(VERSION 2.8) + project(b64 C) + +-include_directories(include) ++include_directories(.) + + add_library(${PROJECT_NAME} STATIC +- src/cdecode.c +- src/cencode.c ++ cdecode.c ++ cencode.c + ) + + install(TARGETS ${PROJECT_NAME} DESTINATION lib) +-install(DIRECTORY include/b64 DESTINATION include) ++install(DIRECTORY b64 DESTINATION include) diff -Nru transmission-2.92/debian/patches/find_qt_build_error transmission-2.92/debian/patches/find_qt_build_error --- transmission-2.92/debian/patches/find_qt_build_error 2016-03-10 05:43:49.000000000 +0000 +++ transmission-2.92/debian/patches/find_qt_build_error 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -192,12 +192,15 @@ - set(QT5_REQUIRED_MODULES Core Gui Widgets Network LinguistTools) - set(QT5_OPTIONAL_MODULES DBus AxContainer AxServer) - foreach(M ${QT5_REQUIRED_MODULES}) -- find_package(Qt5${M} QUIET) -+ #find_package(Qt5${M} QUIET) -+ find_package(Qt5${M}) - if(Qt5${M}_FOUND) -+ message(STATUS "Found Qt5${M}") - if(NOT M STREQUAL "LinguistTools") - list(APPEND QT_TARGETS Qt5::${M}) - endif() - else() -+ message(STATUS "Did not find Qt5${M}") - set(QT_TARGETS) - break() - endif() -@@ -206,13 +209,16 @@ - foreach(M ${QT5_OPTIONAL_MODULES}) - find_package(Qt5${M} QUIET) - if(Qt5${M}_FOUND) -+ message(STATUS "Found Qt5${M} optional") - list(APPEND QT_TARGETS Qt5::${M}) - endif() - endforeach() - if(Qt5AxContainer_FOUND AND Qt5AxServer_FOUND) -+ message(STATUS "Found Qt5 Ax optional") - set(ENABLE_QT_COM_INTEROP ON) - endif() - if(Qt5DBus_FOUND) -+ message(STATUS "Found Qt5 dbus optional") - set(ENABLE_QT_DBUS_INTEROP ON) - endif() - endif() -@@ -255,6 +261,9 @@ - set(QT_FOUND ON) - if(NOT QT_TARGETS OR NOT (ENABLE_QT_COM_INTEROP OR ENABLE_QT_DBUS_INTEROP)) - if(QT_IS_REQUIRED) -+ message(STATUS "QT_TARGETS=${QT_TARGETS}") -+ message(STATUS "ENABLE_QT_COM_INTEROP=${ENABLE_QT_COM_INTEROP}") -+ message(STATUS "ENABLE_QT_DBUS_INTEROP=${ENABLE_QT_DBUS_INTEROP}") - message(FATAL_ERROR "Unable to find required Qt libraries.") - endif() - set(QT_FOUND OFF) diff -Nru transmission-2.92/debian/patches/series transmission-2.92/debian/patches/series --- transmission-2.92/debian/patches/series 2016-03-10 05:41:11.000000000 +0000 +++ transmission-2.92/debian/patches/series 2016-03-12 09:20:35.000000000 +0000 @@ -1,2 +1,2 @@ no_revision_overwrite.diff -find_qt_build_error +disable_external_project_download.diff diff -Nru transmission-2.92/debian/rules transmission-2.92/debian/rules --- transmission-2.92/debian/rules 2016-03-08 18:18:07.000000000 +0000 +++ transmission-2.92/debian/rules 2016-03-12 10:29:19.000000000 +0000 @@ -29,6 +29,12 @@ %: dh $@ $(DH_EXTRA_ARGS) +override_dh_clean: + dh_clean -O--buildsystem=cmake -O--with-systemd + -rm third-party/libb64/CMakeLists.txt + -rm third-party/dht/CMakeLists.txt + -rm third-party/libutp/CMakeLists.txt + override_dh_auto_configure: dh_auto_configure -O--buildsystem=cmake -O--with-systemd -- $(DEB_CMAKE_EXTRA_FLAGS)