[nltk] 05/08: Drop patch now upstream, refresh use-six-patckage.diff patch

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to annotated tag debian/3.2.1-1
in repository nltk.

commit 361f33cc5a42ca1d055821e4baaeea30f79d9230
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date:   Tue May 17 10:52:52 2016 +0200

    Drop patch now upstream, refresh use-six-patckage.diff patch
---
 debian/patches/fix-fsf-address.diff | 16 ----------------
 debian/patches/series               |  1 -
 debian/patches/use-six-package.diff |  4 ++--
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/debian/patches/fix-fsf-address.diff b/debian/patches/fix-fsf-address.diff
deleted file mode 100644
index 744309a..0000000
--- a/debian/patches/fix-fsf-address.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix FSF address
-Author: Daniel Stender <debian at danielstender.com>
-Forwarded: not-needed
-Last-Update: 2014-07-22
-
---- a/nltk/stem/porter.py
-+++ b/nltk/stem/porter.py
-@@ -12,7 +12,7 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- # USA
- #
- # This software is maintained by Vivake (vivakeATomniscia.org) and is available at:
diff --git a/debian/patches/series b/debian/patches/series
index 901e60b..4b9e657 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 use-six-package.diff
-fix-fsf-address.diff
diff --git a/debian/patches/use-six-package.diff b/debian/patches/use-six-package.diff
index 59f6d75..b4c5d74 100644
--- a/debian/patches/use-six-package.diff
+++ b/debian/patches/use-six-package.diff
@@ -4,7 +4,7 @@ Forwarded: not-needed
 Last-Update: 2015-10-24
 --- a/nltk/parse/malt.py
 +++ b/nltk/parse/malt.py
-@@ -9,7 +9,7 @@
+@@ -10,7 +10,7 @@
  
  from __future__ import print_function
  from __future__ import unicode_literals
@@ -12,4 +12,4 @@ Last-Update: 2015-10-24
 +from six import text_type
  
  import os
- import tempfile
+ import sys

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