Simplify and require explicit versions; Release 0.2.1

.gitattributes

@@ -1,86 +1,7 @@
-* text=auto !eol
-/AUTHORS -text
-/COPYING -text
-/ChangeLog -text
-/Makefile.am -text
-/NEWS -text
-/README -text
-/TODO -text svneol=unset#application/octet-stream
-/apertium-rus-ukr.rus-ukr.dix -text
-/apertium-rus-ukr.rus-ukr.lrx -text
-/apertium-rus-ukr.rus-ukr.t1x -text
-/apertium-rus-ukr.rus-ukr.t2x -text
-/apertium-rus-ukr.rus-ukr.t3x -text
-/apertium-rus-ukr.ukr-rus.lrx -text
-/apertium-rus-ukr.ukr-rus.t1x -text
-/apertium-rus-ukr.ukr-rus.t2x -text
-/apertium-rus-ukr.ukr-rus.t3x -text
-/autogen.sh -text
-/configure.ac -text
-corpora/scripts/README -text
-corpora/scripts/cov-kaz.sh -text
-corpora/scripts/coverage.sh -text
-corpora/scripts/hitparade.sh -text
-corpora/scripts/hitparade_pair.sh -text
-corpora/scripts/makeparade.sh -text
-corpora/scripts/morphfreq.sh -text
-corpora/scripts/new-parade.sh -text
-corpora/scripts/process-wikipedia.sh -text
-corpora/scripts/trimmed-coverage.sh -text
-corpora/scripts/wpdump2txt.sh -text
-corpora/scripts/xml2txt.py -text
-dev/gci-tasks/missing-adjs.rus.00 -text
-dev/gci-tasks/missing-adjs.rus.01 -text
-dev/gci-tasks/missing-adjs.rus.02 -text
-dev/gci-tasks/missing-adjs.rus.03 -text
-dev/gci-tasks/missing-adjs.rus.04 -text
-dev/gci-tasks/missing-adjs.rus.05 -text
-dev/gci-tasks/missing-adjs.rus.06 -text
-dev/gci-tasks/missing-adjs.rus.07 -text
-dev/gci-tasks/missing-adjs.rus.08 -text
-dev/gci-tasks/missing-verbs.rus.00 -text
-dev/gci-tasks/missing-verbs.rus.01 -text
-dev/gci-tasks/missing-verbs.rus.02 -text
-dev/gci-tasks/missing-verbs.rus.03 -text
-dev/gci-tasks/missing-verbs.rus.04 -text
-dev/gci-tasks/missing-verbs.rus.05 -text
-dev/gci-tasks/missing-verbs.rus.06 -text
-dev/gci-tasks/missing-verbs.rus.07 -text
-dev/interwiki.ru-uk -text
-dev/ru-uk-adj -text
-dev/ru-uk-adv -text
-dev/ru-uk-nouns -text
-dev/ru-uk-pl-lv-en.csv -text
-dev/ru-uk-verb -text
-dev/strip-accents.pl -text
-dev/testvoc/bidix-unknowns.sh -text
-dev/testvoc/generation.sh -text
-dev/testvoc/streamparser.py -text
-dev/testvoc/test-ngrams.sh -text
-dev/uk-ispell-entries -text
-dev/uk-ru-indeclinable -text
-dev/uk-sint-auto -text
-/modes.xml -text
-texts/WER.txt -text
-texts/article2.rus.reference.txt -text svneol=unset#application/octet-stream
-texts/article2.rus.test.txt -text svneol=unset#application/octet-stream
-texts/article2.ukr.txt -text svneol=unset#application/octet-stream
-texts/article3.rus.reference-google.txt -text svneol=unset#application/octet-stream
-texts/article3.rus.reference-pere.org.ua.txt -text svneol=unset#application/octet-stream
-texts/article3.rus.reference-pragma.txt -text svneol=unset#application/octet-stream
-texts/article3.rus.reference-yandex.txt -text svneol=unset#application/octet-stream
-texts/article3.rus.reference.txt -text svneol=unset#application/octet-stream
-texts/article3.rus.test-google.txt -text svneol=unset#application/octet-stream
-texts/article3.rus.test-pere.org.ua.txt -text svneol=unset#application/octet-stream
-texts/article3.rus.test-pragma.txt -text svneol=unset#application/octet-stream
-texts/article3.rus.test-yandex.txt -text svneol=unset#application/octet-stream
-texts/article3.rus.test.txt -text svneol=unset#application/octet-stream
-texts/article3.ukr.txt -text svneol=unset#application/octet-stream
-texts/rasskaz.rus.txt -text svneol=unset#application/octet-stream
-texts/rasskaz.ukr-rus.txt -text svneol=unset#application/octet-stream
-texts/rasskaz.ukr.txt -text svneol=unset#application/octet-stream
+* text eol=lf
 *.dix linguist-language=XML linguist-detectable=true
 *.lrx linguist-language=XML linguist-detectable=true
 *.lsx linguist-language=XML linguist-detectable=true
 *.tsx linguist-language=XML linguist-detectable=true
 *.t[[:digit:]]x linguist-language=XML linguist-detectable=true
+*.prob binary

.gitignore

@@ -13,3 +13,6 @@
 /install-sh
 /missing
 /stamp-h1
+/ap_include.am
+/modes
+/*.prob

Makefile.am

@@ -2,7 +2,6 @@
 ## Makefile for Ukrainian--Russian
 ###############################################################################
 
-VERSION=0.2.0
 LANG1=rus
 LANG2=ukr
 PREFIX1=$(LANG1)-$(LANG2)
@@ -214,4 +213,3 @@ test: all
 	@echo "house" > .test-ref
 	@diff .test-ref .test-mt
 	@rm .test-ref .test-mt
-

configure.ac

@@ -1,37 +1,21 @@
 AC_PREREQ(2.52)
 
-AC_INIT([Apertium Ukrainian-Russian], [0.2.0], [[email protected]], [apertium-rus-ukr], [http://wiki.apertium.org/wiki/Apertium-rus-ukr])
+AC_INIT([Apertium Ukrainian-Russian], [0.2.1], [[email protected]], [apertium-rus-ukr], [http://wiki.apertium.org/wiki/Apertium-rus-ukr])
 AM_INIT_AUTOMAKE
-
-AC_PROG_LN_S
 AC_PROG_AWK
 
-m4_define([required_apertium_version], [3.4.0])
-PKG_CHECK_MODULES(APERTIUM, apertium >= required_apertium_version, [], [PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= required_apertium_version)])
-
-
-
-AC_PATH_PROG([CGCOMP], [cg-comp], [false], [$PATH$PATH_SEPARATOR$with_cg_comp/bin])
-AS_IF([test x$CGCOMP = xfalse], [AC_MSG_ERROR([You don't have cg-comp installed])])
-
-AC_PATH_PROG([CGPROC], [cg-proc], [false], [$PATH$PATH_SEPARATOR$with_cg_proc/bin])
-AS_IF([test x$CGPROC = xfalse], [AC_MSG_ERROR([You don't have cg-proc installed])])
-
-AC_PATH_PROG([LRXCOMP], [lrx-comp], [false], [$PATH$PATH_SEPARATOR$with_lrx_comp/bin])
-AS_IF([test x$LRXCOMP = xfalse], [AC_MSG_ERROR([You don't have lrx-comp installed])])
-
-AC_PATH_PROG([LRXPROC], [lrx-proc], [false], [$PATH$PATH_SEPARATOR$with_lrx_proc/bin])
-AS_IF([test x$LRXPROC = xfalse], [AC_MSG_ERROR([You don't have lrx-proc installed])])
+PKG_CHECK_MODULES(APERTIUM, apertium >= 3.7.1)
+PKG_CHECK_MODULES(APERTIUM_LEX_TOOLS, apertium-lex-tools >= 0.2.6)
+PKG_CHECK_MODULES(CG3, cg3 >= 1.3.2)
 
 AC_PATH_PROGS(ZCAT, [gzcat zcat], [false])
 AS_IF([test x$ZCAT = xfalse], [AC_MSG_ERROR([You don't have zcat nor gzcat installed])])
 
 m4_ifdef([AP_CHECK_LING],[],[AC_MSG_ERROR([AP_CHECK_LING not defined, is apertium.m4 in ACLOCAL_PATH? See: http://wiki.apertium.org/wiki/Installation_troubleshooting])])
 
-AP_CHECK_LING([1], [apertium-rus])
-AP_CHECK_LING([2], [apertium-ukr])
+AP_CHECK_LING([1], [apertium-rus], [0.2.1])
+AP_CHECK_LING([2], [apertium-ukr], [0.1.1])
 
 AP_MKINCLUDE
 
 AC_OUTPUT([Makefile])
-