[lua-torch-nn] 05/07: patch: remove THNN-assume-torch-is-present

[Zhou Mo]

This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch master
in repository lua-torch-nn.

commit 728d1e651216160751975d8c85787277aaa6c318
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Jan 11 06:48:21 2017 +0000

    patch: remove THNN-assume-torch-is-present
---
 debian/changelog                            |  2 ++
 debian/patches/THNN-assume-torch-is-present | 15 ---------------
 debian/rules                                |  4 +++-
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a55c73..341186a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ lua-torch-nn (0~20170104-ge77b592+dfsg-1) UNRELEASED; urgency=medium
 
   * Import upstream snapshot.
   * Bump debhelper compat to 10.
+  * Remove patch: THNN-assume-torch-is-present . Use cmake flag
+    `Torch_FOUND` in d/rules instead.
 
  -- Zhou Mo <cdluminate at gmail.com>  Tue, 10 Jan 2017 14:27:59 +0000
 
diff --git a/debian/patches/THNN-assume-torch-is-present b/debian/patches/THNN-assume-torch-is-present
deleted file mode 100644
index 529a05d..0000000
--- a/debian/patches/THNN-assume-torch-is-present
+++ /dev/null
@@ -1,15 +0,0 @@
-Change upstream cmake behaviour.
-Forward: no, keeping this patch downstrem.
---- a/lib/THNN/CMakeLists.txt
-+++ b/lib/THNN/CMakeLists.txt
-@@ -1,10 +1,6 @@
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
- CMAKE_POLICY(VERSION 2.6)
- 
--IF(NOT Torch_FOUND)
--  FIND_PACKAGE(Torch REQUIRED)
--ENDIF()
--
- IF(NOT THNN_INSTALL_LIB_SUBDIR)
-   SET(THNN_INSTALL_LIB_SUBDIR "lib" CACHE PATH "THNN install library directory")
- ENDIF()
diff --git a/debian/rules b/debian/rules
index 4d63cb9..649afd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,9 @@ TORCH_FLAGS_5_1= \
  -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_INSTALL_PREFIX=/usr \
  -DCMAKE_C_FLAGS="-I/usr/include/TH -g" \
- -DTORCH_FOUND=ON
+ -DTorch_FOUND=ON \
+ -DUSE_THNN_SO_VERSION=ON \
+ -DTHNN_SO_VERSION="0"
 
 %:
 	dh $@ --buildsystem=lua --with lua --parallel

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/lua-torch-nn.git