diff -Nru wordnet-3.0/debian/changelog wordnet-3.0/debian/changelog --- wordnet-3.0/debian/changelog 2018-01-20 21:48:42.000000000 +0000 +++ wordnet-3.0/debian/changelog 2020-01-25 11:43:44.000000000 +0000 @@ -1,3 +1,14 @@ +wordnet (1:3.0-36) unstable; urgency=medium + + [ Stuart Prescott ] + * Team upload. + * Drop use of Python 2 in building package (Closes: #938831). + + [ Jelmer Vernooij ] + * Trim trailing whitespace. + + -- Stuart Prescott Sat, 25 Jan 2020 22:43:44 +1100 + wordnet (1:3.0-35) unstable; urgency=medium * Team upload. @@ -78,7 +89,7 @@ wordnet (1:3.0-29) unstable; urgency=low * Team upload. - * Fix index processing error in morphstr() function. + * Fix index processing error in morphstr() function. Closes: #700914 -- Anton Gladky Tue, 26 Feb 2013 20:40:25 +0100 @@ -558,7 +569,7 @@ wordnet (2.0g-10) unstable; urgency=low - * Build with dynamic library. Thanks to + * Build with dynamic library. Thanks to Guillaume Rousse * Renamed library from libwn to libwordnet to avoid name clash with libwn6. @@ -591,7 +602,7 @@ wordnet (2.0g-7) unstable; urgency=low * Fixes explanation of antonym. This was raised up by - Peter Palfrader and upstream + Peter Palfrader and upstream George Miller provided an enhanced explanation (thanks to both). Closes: #243645 @@ -730,7 +741,7 @@ * Versioned Build-Depends: debhelper (>= 4) * Clean build directory after building package to save disk space on Building machine - + -- Andreas Tille Thu, 12 Jun 2003 22:23:19 +0200 wordnet (1.7.1-3) unstable; urgency=low @@ -785,7 +796,7 @@ wordnet (1.7-6) unstable; urgency=low - * fixes misspelling in senses database (Thanks to + * fixes misspelling in senses database (Thanks to Matt Kraai ) closes: #137121 * Added @@ -840,7 +851,7 @@ * New upstream version * as in version 1.6 index.sense is removed from the upstream source to save bandwidth and autoconf stuff is added - + -- Andreas Tille Sun, 01 Jul 2001 11:38:54 +0200 wordnet (1.6-16) unstable; urgency=low @@ -851,7 +862,7 @@ * fixed Maintainer e-mail in control file and several others * manpage for wishwn * conffile /etc/X11/app-defaults/XWordnet - + -- Andreas Tille Tue, 15 May 2001 14:03:13 +0200 wordnet (1.6-15) unstable; urgency=low @@ -914,7 +925,7 @@ * closes: #52579 -- Andreas Tille Thu, 30 Dec 1999 09:48:41 +0100 - + wordnet (1.6-8) frozen unstable; urgency=low * closes: #50289 @@ -923,30 +934,30 @@ * switched to debhelper -- Andreas Tille Tue, 23 Nov 1999 11:11:56 +0100 - + wordnet (1.6-7) frozen unstable; urgency=low * FHS * Policy 3.0.1.0 * closes: #43009 by applying a patch from David Engel - + -- Andreas Tille Tue, 3 Aug 1999 11:36:17 +0000 wordnet (1.6-6) frozen unstable; urgency=low * Fixed Bug#39960 * glibc2.1 - + -- Andreas Tille Wed, 23 Jun 1999 19:03:42 +0000 - + wordnet (1.6-5) frozen unstable; urgency=low * Added FILES_TO_CLEAN = debian/files debian/substvars to rules file (Fixes Bug#30638) * recompiled against libc6_2.0.7v-1 to avoid upgrading problems from Hamm - + -- Andreas Tille Thu, 07 Jan 1999 9:57:42 +0000 - + wordnet (1.6-4) frozen unstable; urgency=low * Fixed bugs #28718, #28889 and #29545 which requires full source upload because there were @@ -954,7 +965,7 @@ * deleted duplicate license file /usr/share/wordnet/wnres/license.txt * renamed /usr/doc/wordnet/LICENSE to Wordnet.lic to avoid lintian warning - + -- Andreas Tille Wed, 18 Nov 1998 16:21:42 +0200 wordnet (1.6-3.1) unstable; urgency=low @@ -970,7 +981,7 @@ * applied bugfix search.c from official WordNet server * Corrected unusual source upload, i.e. - support wordnet_1.6.orig.tar.gz - - doesn't contain dict/index.sense because it is not used by the + - doesn't contain dict/index.sense because it is not used by the searching programs and is 6M bytes long (why uploading such a big diff in every new package?) - Included my automake/autoconf stuff and one necessary minor @@ -1005,7 +1016,7 @@ departed the Debian project I decided to become the new maintainer. * I started from scratch with version 1.6. - * added automake stuff to the original source + * added automake stuff to the original source * Patched wnconsts.h to define DEFAULTPATH and DEFAULTBIN via compile option rather than #define in this file * I decided to put it in text like spell programs an dictionaries @@ -1017,13 +1028,13 @@ * Furthermore I leaved out index.gloss from the package because after scanning the sources for this file I didn't found any reference to this file. That's why I decided to save disk space. Please - report any problem which might be produced by the lack of this file. + report any problem which might be produced by the lack of this file. -- Andreas Tille Fri, 3 Apr 1998 22:18:42 +0200 wordnet (1.5-3) unstable; urgency=low - * Added X11/app-defaults configuration + * Added X11/app-defaults configuration * Divided original package into two parts. This is part 2 * Corrected xwn interface, Bug#15605 @@ -1038,7 +1049,7 @@ wordnet (1.5-1) unstable; urgency=low - * File dict/index.sense, in wordNet's source package, was deleted because it + * File dict/index.sense, in wordNet's source package, was deleted because it is not used by the searching programs and is 6M bytes long. * File cntlist.fix.gz is a fix from wordNet to replace dict/cntlist . Due to its large size, about 1M bytes, the fix was applied to the @@ -1046,9 +1057,9 @@ reflects this change. We want to avoid very large diffs . * Deleted pre-compiled binaries (and they were mannny) from .orig.tar.gz . * Major structural changes to three Makefiles. Now, debmake stays happy. - * altered wngrep(1) to default to /usr/lib/wordnet/dict + * altered wngrep(1) to default to /usr/lib/wordnet/dict * Hardcoded cut(1) into src/lib/wngrep -- cut(1) is faster than awk(1). - * Altered DEFAULTPATH in src/lib/wnconsts.h + * Altered DEFAULTPATH in src/lib/wnconsts.h * Initial Release. -- Ioannis Tambouras Wed, 29 Oct 1997 23:56:21 -0500 diff -Nru wordnet-3.0/debian/control wordnet-3.0/debian/control --- wordnet-3.0/debian/control 2018-01-20 21:48:42.000000000 +0000 +++ wordnet-3.0/debian/control 2020-01-25 11:43:44.000000000 +0000 @@ -10,7 +10,7 @@ libxaw7-dev, flex, dictzip, - python, + python3, groff, bison, man-db, diff -Nru wordnet-3.0/debian/patches/python3.patch wordnet-3.0/debian/patches/python3.patch --- wordnet-3.0/debian/patches/python3.patch 1970-01-01 00:00:00.000000000 +0000 +++ wordnet-3.0/debian/patches/python3.patch 2020-01-25 11:43:44.000000000 +0000 @@ -0,0 +1,76 @@ +Description: port script to Python 3 + Use 2to3 and then manually fix the script to by compatible with Python 3. +Author: Stuart Prescott +Bug: #938831 +--- a/contrib/wordnet_structures/wordnet_structures.py ++++ b/contrib/wordnet_structures/wordnet_structures.py +@@ -324,7 +324,7 @@ + rv = '' + while (e > 0): + e -= 1 +- d = (i / 64**e) ++ d = (i // 64**e) + rv += cls.base64_map[d] + i = i % (64**e) + return rv +@@ -363,12 +363,12 @@ + ('00-database-url', '00-database-url\n%s\n' % self.wn_url)): + word_data[key] = value + +- words = word_data.keys() ++ words = list(word_data.keys()) + words.sort() + + for word in words: + wval = word_data[word] +- if (isinstance(wval, basestring)): ++ if (isinstance(wval, str)): + # special case: preformatted entries + self.dict_entry_write(file_index, file_data, word, wval) + continue +@@ -415,15 +415,15 @@ + wnd = WordnetDict(wn_url=options.wn_url, desc_short=options.desc_short, desc_long=options.desc_long) + + for i in range(0,len(args),2): +- print 'Opening index file %r...' % args[i] +- file_index = file(args[i]) +- print 'Opening data file %r...' % args[i+1] +- file_data = file(args[i+1]) +- print 'Parsing index file...' ++ print('Opening index file %r...' % args[i]) ++ file_index = open(args[i]) ++ print('Opening data file %r...' % args[i+1]) ++ file_data = open(args[i+1]) ++ print('Parsing index file...') + wnd.wn_dict_add(file_index, file_data, synset_wrap_cls=SynsetWrapperPointer) + +- print 'All index files parsed. Parsing data input files and writing output to index file %r and data file %r.' % (options.oi, options.od) ++ print('All index files parsed. Parsing data input files and writing output to index file %r and data file %r.' % (options.oi, options.od)) + +- wnd.dict_generate(file(options.oi, 'w'),file(options.od, 'w')) +- print 'All done.' ++ wnd.dict_generate(open(options.oi, 'w'),open(options.od, 'w')) ++ print('All done.') + +--- a/contrib/wordnet_structures/Makefile.am ++++ b/contrib/wordnet_structures/Makefile.am +@@ -5,7 +5,7 @@ + wn.index: + wn.dict.dz: + LC_ALL=C \ +- python wordnet_structures.py \ ++ python3 wordnet_structures.py \ + ../../dict/dbfiles/index.adv ../../dict/dbfiles/data.adv \ + ../../dict/dbfiles/index.adj ../../dict/dbfiles/data.adj \ + ../../dict/dbfiles/index.noun ../../dict/dbfiles/data.noun \ +--- a/contrib/wordnet_structures/Makefile.in ++++ b/contrib/wordnet_structures/Makefile.in +@@ -371,7 +371,7 @@ + wn.index: + wn.dict.dz: + LC_ALL=C \ +- python wordnet_structures.py \ ++ python3 wordnet_structures.py \ + ../../dict/dbfiles/index.adv ../../dict/dbfiles/data.adv \ + ../../dict/dbfiles/index.adj ../../dict/dbfiles/data.adj \ + ../../dict/dbfiles/index.noun ../../dict/dbfiles/data.noun \ diff -Nru wordnet-3.0/debian/patches/series wordnet-3.0/debian/patches/series --- wordnet-3.0/debian/patches/series 2018-01-20 21:48:42.000000000 +0000 +++ wordnet-3.0/debian/patches/series 2020-01-25 11:43:44.000000000 +0000 @@ -1,5 +1,6 @@ 01_tcltk8.6.patch 10_wordnet_structures.patch +python3.patch 20_doc_Makefile.in.patch 20_doc_man_wninput.patch 20_include_wn.h.patch