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

Sat Sep 10 04:47:33 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 7d360888b2bb310107b88b8d3d684220db2ac52c
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat Sep 10 03:32:11 2016 +0000

    patch: remove merged patch
---
 debian/changelog                  |  1 +
 debian/patches/fix-spelling-error | 92 ---------------------------------------
 debian/patches/series             |  2 -
 3 files changed, 1 insertion(+), 94 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9edcee..81f2d2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 lua-torch-torch7 (0~20160908-ge5ebac6-1) UNRELEASED; urgency=medium
 
   * Import upstream snapshot e5ebac6a3d6b14382e4641a8701f23b57e7d6e30.
+  * Remove patch 'fix-spelling-error' which was merged to upstream.
 
  -- Zhou Mo <cdluminate at gmail.com>  Sat, 10 Sep 2016 03:25:56 +0000
 
diff --git a/debian/patches/fix-spelling-error b/debian/patches/fix-spelling-error
deleted file mode 100644
index ad80d29..0000000
--- a/debian/patches/fix-spelling-error
+++ /dev/null
@@ -1,92 +0,0 @@
-Forward: yes. https://github.com/torch/torch7/pull/739
-diff --git a/ROADMAP.md b/ROADMAP.md
-index cb9c5ad..d906126 100644
---- a/ROADMAP.md
-+++ b/ROADMAP.md
-@@ -84,7 +84,7 @@ The roadmap focuses on five separate things
- 		   Also, I agree, I actually could not install iTorch on my laptop 
-                    before cvpr tutorial somehow, it did not want to work :).
-   - **soumith**: I think we should propose a common display API that any interface can implement, 
--                 that way the users dont need to change scripts across different UI backends.
-+                 that way the users don't need to change scripts across different UI backends.
- 	         Also, szym/display is a good candidate for the Web UI, ITorch is indeed a bit of a pain to install.
- 
-   - Should we endorse iTorch for everyone to use? 
-diff --git a/Tensor.lua b/Tensor.lua
-index 0d573aa..b4b3e95 100644
---- a/Tensor.lua
-+++ b/Tensor.lua
-@@ -389,7 +389,7 @@ torch.repeatTensor = Tensor.repeatTensor
- --- One of the size elements can be -1,
-  --- a new LongStorage is then returned.
-  --- The length of the unspecified dimension
-- --- is infered from the number of remaining elements.
-+ --- is inferred from the number of remaining elements.
- local function specifyFully(size, nElements)
-     local nCoveredElements = 1
-     local remainingDim = nil
-diff --git a/Tester.lua b/Tester.lua
-index a3b3ff3..f512edb 100644
---- a/Tester.lua
-+++ b/Tester.lua
-@@ -236,7 +236,7 @@ function Tester:_assertTensorEqOrNeq(ta, tb, negate, ...)
-    if self._assertTensorEqIgnoresDims and (not negate) and success
-          and not ta:isSameSizeAs(tb) then
-      self:_warning("Tensors have the same content but different dimensions. "
--                   .. "For backwards compatability, they are considered equal, "
-+                   .. "For backwards compatibility, they are considered equal, "
-                    .. "but this may change in the future. Consider using :eq "
-                    .. "to check for equality instead.")
-    end
-diff --git a/lib/TH/THDiskFile.c b/lib/TH/THDiskFile.c
-index dff9710..7064b7f 100644
---- a/lib/TH/THDiskFile.c
-+++ b/lib/TH/THDiskFile.c
-@@ -207,7 +207,7 @@ static size_t THDiskFile_position(THFile *self)
-   if (offset > -1)
-       return (size_t)offset;
-   else if(!dfself->file.isQuiet)
--      THError("unable to obtain disk file offset (maybe a long overflow occured)");
-+      THError("unable to obtain disk file offset (maybe a long overflow occurred)");
- 
-   return 0;
- }
-diff --git a/lib/TH/generic/THTensorRandom.c b/lib/TH/generic/THTensorRandom.c
-index f8097c8..514d3dd 100644
---- a/lib/TH/generic/THTensorRandom.c
-+++ b/lib/TH/generic/THTensorRandom.c
-@@ -119,7 +119,7 @@ void THTensor_(multinomial)(THLongTensor *self, THGenerator *_generator, THTenso
-     THArgCheckWithCleanup((sum > 0), THCleanup(THDoubleTensor_free(cum_dist);), 2,
-                           "invalid multinomial distribution (sum of probabilities <= 0)");
-     /* normalize cumulative probability distribution so that last val is 1
--    i.e. dosen't assume original prob_dist row sums to one */
-+    i.e. doesn't assume original prob_dist row sums to one */
-     if ( (sum > 0) || ( ( sum < 1.00001) && (sum > 0.99999) ) )
-     {
-       for (j=0; j<n_categories; j++)
-diff --git a/lib/luaT/README.md b/lib/luaT/README.md
-index 431e37f..f28d143 100644
---- a/lib/luaT/README.md
-+++ b/lib/luaT/README.md
-@@ -237,7 +237,7 @@ shall not be freed. It is a pointer inside `tname` string.
- 
- <a name="luat_classmodulename"/>
- ### int luaT_classmodulename(const char *tname, char *parent_name) ###
--Alias to `luaT_fullparentname ` for ensuring backwards compatibilty; 
-+Alias to `luaT_fullparentname ` for ensuring backwards compatibility; 
- use of `luaT_fullparentname` is preferred.
- 
- <a name="luat_fullparentname"/>
-diff --git a/test/test.lua b/test/test.lua
-index 20ca035..fc5228c 100644
---- a/test/test.lua
-+++ b/test/test.lua
-@@ -183,7 +183,7 @@ function torchtest.rsqrt()
- end
- 
- function torchtest.sigmoid()
--   -- cant use genericSingleOpTest, since `math.sigmoid` doesnt exist, have to use
-+   -- can't use genericSingleOpTest, since `math.sigmoid` doesn't exist, have to use
-    -- `torch.sigmoid` instead
-    local inputValues = {-1000,-1,0,0.5,1,2,1000}
-    local expectedOutput = {0.0000, 0.2689, 0.5, 0.6225, 0.7311, 0.8808, 1.000}
diff --git a/debian/patches/series b/debian/patches/series
index b7178a2..00ec674 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-# You must remove unused comment lines for the released package.
-fix-spelling-error
 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

