[lua-torch-torch7] 04/05: patch: remove merged patch

Zhou Mo cdluminate-guest at moszumanska.debian.org
Mon Oct 3 08:44:19 UTC 2016


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

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

commit 57a1f9fcae8138aaace42ff05a3cc1676ddca93b
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Oct 3 08:37:14 2016 +0000

    patch: remove merged patch
---
 debian/changelog                             |  1 +
 debian/patches/fix-cmake-checkfunctionexists | 18 ------------------
 debian/patches/series                        |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ad5187..e321dca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 lua-torch-torch7 (0~20161002-geb397ad-1) UNRELEASED; urgency=medium
 
   * Import upstream snapshot (eb397ad).
+  * Remove merged patch: fix-cmake-checkfunctionexists .
 
  -- Zhou Mo <cdluminate at gmail.com>  Mon, 03 Oct 2016 08:34:17 +0000
 
diff --git a/debian/patches/fix-cmake-checkfunctionexists b/debian/patches/fix-cmake-checkfunctionexists
deleted file mode 100644
index 341b364..0000000
--- a/debian/patches/fix-cmake-checkfunctionexists
+++ /dev/null
@@ -1,18 +0,0 @@
-Forwarded: https://github.com/torch/torch7/pull/761
-
-diff --git a/lib/TH/CMakeLists.txt b/lib/TH/CMakeLists.txt
-index e1610af..bc287c1 100644
---- a/lib/TH/CMakeLists.txt
-+++ b/lib/TH/CMakeLists.txt
-@@ -26,6 +26,11 @@ IF(MSVC)
-   ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE=1)
- ENDIF(MSVC)
- 
-+IF(UNIX)
-+  # prevent Unknown CMake command "check_function_exists".
-+  INCLUDE(CheckFunctionExists)
-+ENDIF(UNIX)
-+
- # OpenMP support?
- SET(WITH_OPENMP ON CACHE BOOL "OpenMP support if available?")
- IF (APPLE AND CMAKE_COMPILER_IS_GNUCC)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6caf852..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-cmake-checkfunctionexists

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



More information about the debian-science-commits mailing list