diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-23 11:20:24 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-23 11:20:24 +0000 |
commit | 9f888c945bf35a5aac073212ed4d98a3d3c995a2 (patch) | |
tree | 2196a221c65dc84a59c71f9986ecb6f95ca3f24f | |
parent | 0bad72ab8a3ccc80eab77dad4b727840674153a3 (diff) | |
download | ellinika-9f888c945bf35a5aac073212ed4d98a3d3c995a2.tar.gz ellinika-9f888c945bf35a5aac073212ed4d98a3d3c995a2.tar.bz2 |
Clarify the use of AUTHOR declaration.
* disp.css: Rename to maint.css
* Makefile.am: Likewise.
* xml/uk/ellinika.xml: Simplify <AUTHOR> declaration.
* xml/pl/ellinika.xml: Likewise.
* xml/ru/ellinika.xml: Likewise.
* xml/lingua.conf.in (AUTHOR): Add element.
* xml/Makefile.am (=PACKAGE_BUGREPORT=): New substitution.
* configure.ac: Update version number.
Change bug-reporting email.
* html-files/uk/maint.html: Use maint.css
* html-files/ru/maint.html: Likewise.
* html-files/uk/maint.html: Likewise.
git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@544 941c8c0f-9102-463b-b60b-cd22ce0e6858
-rw-r--r-- | ChangeLog | 15 | ||||
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | configure.ac | 7 | ||||
-rw-r--r-- | html-files/pl/maint.html | 2 | ||||
-rw-r--r-- | html-files/ru/maint.html | 2 | ||||
-rw-r--r-- | html-files/uk/maint.html | 2 | ||||
-rw-r--r-- | maint.css (renamed from disp.css) | 0 | ||||
-rw-r--r-- | xml/Makefile.am | 1 | ||||
-rw-r--r-- | xml/lingua.conf.in | 12 | ||||
-rw-r--r-- | xml/pl/ellinika.xml | 3 | ||||
-rw-r--r-- | xml/ru/ellinika.xml | 3 | ||||
-rw-r--r-- | xml/uk/ellinika.xml | 5 |
12 files changed, 35 insertions, 21 deletions
@@ -1,3 +1,18 @@ +2010-03-23 Sergey Poznyakoff <gray@gnu.org.ua> + + * disp.css: Rename to maint.css + * Makefile.am: Likewise. + * xml/uk/ellinika.xml: Simplify <AUTHOR> declaration. + * xml/pl/ellinika.xml: Likewise. + * xml/ru/ellinika.xml: Likewise. + * xml/lingua.conf.in (AUTHOR): Add element. + * xml/Makefile.am (=PACKAGE_BUGREPORT=): New substitution. + * configure.ac: Update version number. + Change bug-reporting email. + * html-files/uk/maint.html: Use maint.css + * html-files/ru/maint.html: Likewise. + * html-files/uk/maint.html: Likewise. + 2010-03-22 Sergey Poznyakoff <gray@gnu.org.ua> * configure.ac (BASE_HREF, TARGET_DIR): Redefine as diff --git a/Makefile.am b/Makefile.am index 5ee0b11..b287e2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ SUBDIRS=src elisp data scm xml html-files po htmldir = $(HTMLDIR) -html_DATA = style.css .htaccess disp.css index.html maint.html -EXTRA_DIST=.htaccess.in disp.css index.html maint.html +html_DATA = style.css .htaccess maint.css index.html maint.html +EXTRA_DIST=.htaccess.in maint.css index.html maint.html install-html: top_srcdir=`cd $(top_srcdir);pwd`; \ diff --git a/configure.ac b/configure.ac index c74af0e..4ebc336 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ(2.61) AC_REVISION($Revision$) -AC_INIT(ellinika, 1.2, [gray@gnu.org.ua]) +AC_INIT(ellinika, 1.99.99, [gray+ellinika@gnu.org.ua]) AC_CONFIG_SRCDIR(src/cgi-bin/dict.scm4) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_SYSTEM @@ -29,11 +29,8 @@ AM_INIT_AUTOMAKE(no-exeext) M4='`cd $(top_srcdir); pwd`/scripts/missing --run m4' AC_SUBST(M4) -AM_GNU_GETTEXT(external, need-ngettext) -AM_GNU_GETTEXT_VERSION(0.14.1) - MU_CHECK_GUILE(,, - [AC_MSG_ERROR([You need Guile 1.6 or better])]) + [AC_MSG_ERROR([You need Guile 1.8 or newer])]) RA_CHECK_LIB(mysqlclient, mysql_real_connect, diff --git a/html-files/pl/maint.html b/html-files/pl/maint.html index 603121c..483264e 100644 --- a/html-files/pl/maint.html +++ b/html-files/pl/maint.html @@ -4,7 +4,7 @@ <head> <title>Ελληνική Γλώσσα</title> <link rev="made" href="mailto:gray@gnu.org.ua" /> - <link rel="stylesheet" type="text/css" href="/disp.css" /> + <link rel="stylesheet" type="text/css" href="/maint.css" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta name="robots" content="noindex,nofollow"> </head> diff --git a/html-files/ru/maint.html b/html-files/ru/maint.html index e4f712e..76e4965 100644 --- a/html-files/ru/maint.html +++ b/html-files/ru/maint.html @@ -4,7 +4,7 @@ <head> <title>Ελληνική Γλώσσα</title> <link rev="made" href="mailto:gray@gnu.org.ua" /> - <link rel="stylesheet" type="text/css" href="/disp.css" /> + <link rel="stylesheet" type="text/css" href="/maint.css" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta name="robots" content="noindex,nofollow"> </head> diff --git a/html-files/uk/maint.html b/html-files/uk/maint.html index 218a782..3e80258 100644 --- a/html-files/uk/maint.html +++ b/html-files/uk/maint.html @@ -4,7 +4,7 @@ <head> <title>Ελληνική Γλώσσα</title> <link rev="made" href="mailto:gray@gnu.org.ua" /> - <link rel="stylesheet" type="text/css" href="/disp.css" /> + <link rel="stylesheet" type="text/css" href="/maint.css" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta name="robots" content="noindex,nofollow"> </head> diff --git a/xml/Makefile.am b/xml/Makefile.am index e39e6da..ccb5d01 100644 --- a/xml/Makefile.am +++ b/xml/Makefile.am @@ -27,6 +27,7 @@ conf.sed: Makefile echo 's,=SCRIPT_SUFFIX=,$(SCRIPT_SUFFIX),' >> conf.sed echo 's,=SCRIPT_DIR=,$(SCRIPT_DIR),' >> conf.sed echo 's,=BASE_HREF=,$(BASE_HREF),' >> conf.sed + echo 's,=PACKAGE_BUGREPORT=,$(PACKAGE_BUGREPORT),' >> conf.sed lingua.conf: $(srcdir)/lingua.conf.in conf.sed sed -f conf.sed $(srcdir)/lingua.conf.in > $@ diff --git a/xml/lingua.conf.in b/xml/lingua.conf.in index 918d9b1..9ea3534 100644 --- a/xml/lingua.conf.in +++ b/xml/lingua.conf.in @@ -6,7 +6,9 @@ <DIRECTORY OUT="=OUTDIR=" /> <DIRECTORY TARGET="=TARGET_DIR=" /> <DIRECTORY SOUND="=TARGET_DIR=/sound" /> - + + <AUTHOR EMAIL="=PACKAGE_BUGREPORT=" HOMEPAGE="http://gray.gnu.org.ua" /> + <DICT PROG="dict.=SCRIPT_SUFFIX=" /> <BASE HREF="=BASE_HREF=" /> <SEARCH ARGS="(list (lingua:gettext "Search"))"> @@ -49,10 +51,13 @@ (tag attr text) (list "<p>\n" - (format #f "~A <a href=\"mailto:~A\">~A</a>;" + (let ((contact (or + (lingua:attr "AUTHOR" "CONTACT") + (lingua:tag-text "AUTHOR") ))) + (format #f "~A <a href=\"mailto:~A\">~A</a>;" (lingua:gettext "For information about this site contact") (lingua:attr "AUTHOR" "EMAIL") - (lingua:attr "AUTHOR" "CONTACT")) + contact)) "</p>\n<p>" text "</p>\n" @@ -69,7 +74,6 @@ this notice is preserved.</p>\n" "</div>" )) - (xmltrans:end-tag "KATHAREVUSA" diff --git a/xml/pl/ellinika.xml b/xml/pl/ellinika.xml index ef94889..9e3e6af 100644 --- a/xml/pl/ellinika.xml +++ b/xml/pl/ellinika.xml @@ -10,8 +10,7 @@ <!-- $Id$ --> <LINGUA LANG="pl" TER="PL" PREFIX="ellinika" LINK="rss=/pl/nea.rss"> -<AUTHOR EMAIL="gray@gnu.org.ua" HOMEPAGE="http://gray.gnu.org.ua" - CONTACT="&lt;gray at gnu dot org dot ua&gt;" >Sergey Poznyakoff</AUTHOR> +<AUTHOR CONTACT="Sergiusza Poznyakowa">Sergey Poznyakoff</AUTHOR> <KEYWORDS>grecki,gramatyka,słownik</KEYWORDS> <LOCALIZATION> diff --git a/xml/ru/ellinika.xml b/xml/ru/ellinika.xml index 7d3edf0..60866eb 100644 --- a/xml/ru/ellinika.xml +++ b/xml/ru/ellinika.xml @@ -10,8 +10,7 @@ <!-- $Id$ --> <LINGUA LANG="ru" TER="RU" PREFIX="ellinika" LINK="rss=/ru/nea.rss"> -<AUTHOR EMAIL="gray@gnu.org.ua" HOMEPAGE="http://gray.gnu.org.ua" - CONTACT="&lt;gray at gnu dot org dot ua&gt;" >Sergey Poznyakoff</AUTHOR> +<AUTHOR CONTACT="Сергею Познякову">Sergey Poznyakoff</AUTHOR> <KEYWORDS>греческий,грамматика,словарь</KEYWORDS> <LOCALIZATION> diff --git a/xml/uk/ellinika.xml b/xml/uk/ellinika.xml index c2531c2..2e79899 100644 --- a/xml/uk/ellinika.xml +++ b/xml/uk/ellinika.xml @@ -10,14 +10,13 @@ <!-- $Id$ --> <LINGUA LANG="uk" TER="UA" PREFIX="ellinika" LINK="rss=/uk/nea.rss"> -<AUTHOR EMAIL="gray@gnu.org.ua" HOMEPAGE="http://gray.gnu.org.ua" - CONTACT="&lt;gray at gnu dot org dot ua&gt;" >Sergey Poznyakoff</AUTHOR> +<AUTHOR CONTACT="Сергія Познякова" >Sergey Poznyakoff</AUTHOR> <KEYWORDS>грецька,граматика,словник</KEYWORDS> <LOCALIZATION> <MSGSTR ID="Home Page">Домашня сторінка</MSGSTR> <MSGSTR ID="Information">Інформація</MSGSTR> - <MSGSTR ID="For information about this site contact">Щоб отримати докладнішу інформацію, напишіть до </MSGSTR> + <MSGSTR ID="For information about this site contact">Щоб отримати докладнішу інформацію, пишіть до </MSGSTR> <MSGSTR ID="Previous Page">Попередня сторінка</MSGSTR> <MSGSTR ID="Next Page">Наступна сторінка</MSGSTR> <MSGSTR ID="Top of the Page">Початок сторінки</MSGSTR> |