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

[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-torch7.

commit 86fc67fbb7e008c3507244b1eb602b8216986f1e
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat Sep 10 04:15:18 2016 +0000

    patch: remove merged patches
---
 debian/changelog                            |  6 +++++-
 debian/patches/TH-cmake-add-version         | 15 ---------------
 debian/patches/fix-32bit-system-abs-failure | 28 ----------------------------
 debian/patches/luaT-cmake-add-version       | 15 ---------------
 debian/patches/series                       |  3 ---
 5 files changed, 5 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 81f2d2e..74b18a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 lua-torch-torch7 (0~20160908-ge5ebac6-1) UNRELEASED; urgency=medium
 
   * Import upstream snapshot e5ebac6a3d6b14382e4641a8701f23b57e7d6e30.
-  * Remove patch 'fix-spelling-error' which was merged to upstream.
+  * Remove all patches that were merged to upstream.
+    - fix-spelling-error
+    - fix-32bit-system-abs-failure
+    - TH-cmake-add-version
+    - luaT-cmake-add-version
 
  -- Zhou Mo <cdluminate at gmail.com>  Sat, 10 Sep 2016 03:25:56 +0000
 
diff --git a/debian/patches/TH-cmake-add-version b/debian/patches/TH-cmake-add-version
deleted file mode 100644
index fa4de73..0000000
--- a/debian/patches/TH-cmake-add-version
+++ /dev/null
@@ -1,15 +0,0 @@
-add versioning for libTH.so
-Forward: yes. https://github.com/torch/torch7/pull/738
---- a/lib/TH/CMakeLists.txt
-+++ b/lib/TH/CMakeLists.txt
-@@ -137,6 +137,10 @@
-   ADD_LIBRARY(TH_static STATIC ${src})
- endif()
- 
-+SET_TARGET_PROPERTIES(TH PROPERTIES
-+  VERSION   0
-+  SOVERSION 0)
-+
- CHECK_C_SOURCE_RUNS("
- #include <stdatomic.h>
- int main()
diff --git a/debian/patches/fix-32bit-system-abs-failure b/debian/patches/fix-32bit-system-abs-failure
deleted file mode 100644
index b4217af..0000000
--- a/debian/patches/fix-32bit-system-abs-failure
+++ /dev/null
@@ -1,28 +0,0 @@
-Forward: Already merged into upstream master.
-
-commit 8c1cb8a3ae64984eddca99c9481670a8f7cf7b5b
-Author: Zhou Mo <cdluminate at gmail.com>
-Date:   Tue Aug 23 15:11:46 2016 +0000
-
-    test: fix 32-bit system abs test failure.
-    
-    According to https://github.com/torch/torch7/issues/627
-
-diff --git a/test/test.lua b/test/test.lua
-index fc5228c..21df3b6 100644
---- a/test/test.lua
-+++ b/test/test.lua
-@@ -2921,7 +2921,12 @@ function torchtest.abs()
-    end
- 
-    -- Checking that the right abs function is called for LongTensor
--   local bignumber = 2^31 + 1
-+   local bignumber
-+   if torch.LongTensor():elementSize() > 4 then
-+      bignumber = 2^31 + 1
-+   else
-+      bignumber = 2^15 + 1
-+   end
-    local input = torch.LongTensor{-bignumber}
-    mytester:assertgt(input:abs()[1], 0, 'torch.abs(3)')
- end
diff --git a/debian/patches/luaT-cmake-add-version b/debian/patches/luaT-cmake-add-version
deleted file mode 100644
index 1d1d885..0000000
--- a/debian/patches/luaT-cmake-add-version
+++ /dev/null
@@ -1,15 +0,0 @@
-add cmake versioning for libluaT.so
-Fowrad: merged upstream. https://github.com/torch/torch7/pull/733
---- a/lib/luaT/CMakeLists.txt
-+++ b/lib/luaT/CMakeLists.txt
-@@ -13,6 +13,10 @@
-   ADD_LIBRARY(luaT_static STATIC luaT.h luaT.c)
- endif()
- 
-+SET_TARGET_PROPERTIES(luaT PROPERTIES
-+  VERSION   0
-+  SOVERSION 0)
-+
- IF(APPLE)
-   SET_TARGET_PROPERTIES(luaT PROPERTIES
-     LINK_FLAGS "-undefined dynamic_lookup")
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 00ec674..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-TH-cmake-add-version
-luaT-cmake-add-version
-fix-32bit-system-abs-failure

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