summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2018-08-27 09:09:04 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2018-08-27 09:09:04 (GMT)
commit7def44af3ca730d5f5d3cb01f5b262ae1fa36939 (patch) (side-by-side diff)
tree08a018e15890a2c82ca3aa414fd03584b9f0f3af
parent5d25aa3815a470ae497ff313d15ba5b9270d6d71 (diff)
downloaddico-7def44af3ca730d5f5d3cb01f5b262ae1fa36939.tar.gz
dico-7def44af3ca730d5f5d3cb01f5b262ae1fa36939.tar.bz2
Version 2.6release-2.6
* NEWS: Update. * configure.boot: Raise version number. * DISTFILES: New file. * Makefile.am (dist-hook): Add only files explicitly listed in DISTFILES. * app/python/.gitignore: New file. * app/python/DISTFILES: New file. * app/python/README: New file. * app/python/dicod.conf.in: New file. * app/python/mediawiki.py: Fix the initial comment * app/python/requirements.txt: New file. * dicoweb/requirements.txt: Require wikitrans 1.2 or later.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--DISTFILES38
-rw-r--r--Makefile.am5
-rw-r--r--NEWS4
-rw-r--r--app/python/.gitignore1
-rw-r--r--app/python/DISTFILES0
-rw-r--r--app/python/README29
-rw-r--r--app/python/dicod.conf.in13
-rw-r--r--app/python/mediawiki.py2
-rw-r--r--app/python/requirements.txt1
-rw-r--r--configure.boot5
-rw-r--r--dicoweb/requirements.txt2
11 files changed, 92 insertions, 8 deletions
diff --git a/DISTFILES b/DISTFILES
new file mode 100644
index 0000000..fe80e4b
--- a/dev/null
+++ b/DISTFILES
@@ -0,0 +1,38 @@
+app/python/README
+app/python/dicod.conf.in
+app/python/mediawiki.py
+app/python/requirements.txt
+dicoweb/locale/pl
+dicoweb/locale/pl/LC_MESSAGES
+dicoweb/locale/pl/LC_MESSAGES/django.po
+dicoweb/locale/uk
+dicoweb/locale/uk/LC_MESSAGES
+dicoweb/locale/uk/LC_MESSAGES/django.po
+dicoweb/templatetags
+dicoweb/templatetags/__init__.py
+dicoweb/templatetags/media.py
+dicoweb/templatetags/dictlookup.py
+dicoweb/requirements.txt
+dicoweb/templates/base.html
+dicoweb/templates/404.html
+dicoweb/templates/index.html
+dicoweb/templates/opensearch.xml
+dicoweb/templates/500.html
+dicoweb/views.py
+dicoweb/manage.py
+dicoweb/wsgi.py
+dicoweb/__init__.py
+dicoweb/settings-sample.py
+dicoweb/static/dicoweb.css
+dicoweb/static/gnu-head-sm.jpg
+dicoweb/static/dicoweb.js
+dicoweb/dicoclient
+dicoweb/dicoclient/__init__.py
+dicoweb/dicoclient/setup.py
+dicoweb/dicoclient/dicoshell.py
+dicoweb/dicoclient/dicoclient.py
+dicoweb/urls.py
+dicoweb/INSTALL
+dicoweb/dummy_translations.py
+
+
diff --git a/Makefile.am b/Makefile.am
index 7e08807..4e4225c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,10 +34,11 @@ SUBDIRS=\
po
#FIXME: add these when ready: makedict client fonts
-EXTRA_DIST = ChangeLog.2008 configure.boot bootstrap
+EXTRA_DIST = ChangeLog.2008 configure.boot bootstrap DISTFILES
dist-hook:
- tar -C $(srcdir) -c -f - --exclude-vcs app dicoweb | \
+ tar -C $(srcdir) -c -f - --no-recursion --exclude-vcs \
+ -T $(abs_top_srcdir)/DISTFILES | \
tar -C $(distdir) -x -f -
# Start Git ChangeLog from this date.
diff --git a/NEWS b/NEWS
index b4ecaa4..f093de6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,10 @@
-GNU Dico NEWS -- history of user-visible changes. 2018-07-25
+GNU Dico NEWS -- history of user-visible changes. 2018-08-27
Copyright (C) 2008-2010, 2012-2018 Sergey Poznyakoff
See the end of file for copying conditions.
Please send Dico bug reports to <bug-dico@gnu.org.ua>
-Version 2.5.90 (git)
+Version 2.6, 2018-08-27
* Support for Guile 2.2.0
diff --git a/app/python/.gitignore b/app/python/.gitignore
new file mode 100644
index 0000000..32e3aca
--- a/dev/null
+++ b/app/python/.gitignore
@@ -0,0 +1 @@
+dicod.conf
diff --git a/app/python/DISTFILES b/app/python/DISTFILES
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/app/python/DISTFILES
diff --git a/app/python/README b/app/python/README
new file mode 100644
index 0000000..0ac4be1
--- a/dev/null
+++ b/app/python/README
@@ -0,0 +1,29 @@
+This is mediawiki.py - a Python module which enables dicod to use Wiktionary
+as a database. To use the module, you will first need to install its
+prerequisites. To do so, run
+
+ pip install -r requirements.txt
+
+If the package has been built properly, the file dicod.conf will be created
+in this dicrectory. This file configures a single "en-wiktionary" dictionary,
+which will be using http://en.wiktionary.org as a database.
+You can use this file to test the module without installing the package,
+E.g., to list dictionary entries matching "word":
+
+ ../../dicod/dicod --config ./dicod.conf --stderr --inetd <<<"match ! . word"
+
+This will display something like that:
+
+220 harp dicod (GNU dico) 2.6 <mime.lang.markup.xversion.xlev.markup-none.markup-wiki> <3865.1535358562@harp>
+152 4 matches found: list follows
+en-wiktionary "word"
+en-wiktionary "Word"
+en-wiktionary "words"
+en-wiktionary "wordy"
+.
+250 Command complete
+
+To show the Wiktionary article for "word":
+
+ ../../dicod/dicod --config ./dicod.conf --stderr --inetd <<<"define ! word"
+
diff --git a/app/python/dicod.conf.in b/app/python/dicod.conf.in
new file mode 100644
index 0000000..fa94260
--- a/dev/null
+++ b/app/python/dicod.conf.in
@@ -0,0 +1,13 @@
+capability (mime,markup,lang,xversion,xlev);
+prepend-load-path ("@abs_top_srcdir@/modules/python");
+load-module python {
+ command "python load-path=@abs_top_srcdir@/app/python";
+}
+database {
+ name "en-wiktionary";
+ handler "python init-script=mediawiki en.wiktionary.org";
+ description "en.wiktionary.org";
+}
+
+
+ \ No newline at end of file
diff --git a/app/python/mediawiki.py b/app/python/mediawiki.py
index b9586c7..ea70ed8 100644
--- a/app/python/mediawiki.py
+++ b/app/python/mediawiki.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Mediawiki module for Python 3
+# Mediawiki module for Python
# This file is part of GNU Dico.
# Copyright (C) 2008-2010, 2012 Wojciech Polak
# 2018 Sergey Poznyakoff
diff --git a/app/python/requirements.txt b/app/python/requirements.txt
new file mode 100644
index 0000000..a02655e
--- a/dev/null
+++ b/app/python/requirements.txt
@@ -0,0 +1 @@
+wikitrans>=1.2
diff --git a/configure.boot b/configure.boot
index 69e2b4e..3ed63b8 100644
--- a/configure.boot
+++ b/configure.boot
@@ -28,7 +28,7 @@ dnl Process this file with -*- autoconf -*- to produce a configure script.
# along with GNU Dico. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.63)
-AC_INIT([GNU dico], 2.5.90, [bug-dico@gnu.org])
+AC_INIT([GNU dico], 2.6, [bug-dico@gnu.org])
AC_CONFIG_SRCDIR([dicod/main.c])
AM_CONFIG_HEADER(config.h)
AC_CONFIG_AUX_DIR([build-aux])
@@ -310,6 +310,7 @@ AC_CONFIG_FILES([Makefile
dico/Makefile
scripts/Makefile
doc/Makefile
- po/Makefile.in])
+ po/Makefile.in
+ app/python/dicod.conf])
AC_OUTPUT
diff --git a/dicoweb/requirements.txt b/dicoweb/requirements.txt
index 85df14b..2bc4fe9 100644
--- a/dicoweb/requirements.txt
+++ b/dicoweb/requirements.txt
@@ -1,4 +1,4 @@
Django>=2.0;python_version>="3.0"
Django==1.11.5;python_version<="2.7"
-wikitrans==1.0
+wikitrans>=1.2
python-memcached>=1.59

Return to:

Send suggestions and report system problems to the System administrator.