Release 1.3.0

.gitattributes

@@ -1,29 +1,7 @@
-* text=auto !eol
-/ACKNOWLEDGEMENTS -text
-/AUTHORS -text
-/COPYING -text
-/ChangeLog -text
-/Jenkinsfile -text
-/Makefile.am -text
-/NEWS -text
-/README -text
-/apertium-srd.pc.in -text
-/apertium-srd.post-srd.dix -text
-/apertium-srd.srd.acx -text
-/apertium-srd.srd.dix -text
-/apertium-srd.srd.rlx -text
-/autogen.sh -text
-/configure.ac -text
-/genvdix.py -text
-/modes.xml -text
-/srd-supervised.make -text
-/srd-unsupervised.make -text
-/srd.prob -text svneol=unset#unset
-/test_verbs.bash -text
-texts/cuento.vislcg.txt -text
-texts/puupankki/puupankki.srd.conllu -text
+* 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

AUTHORS

@@ -1,3 +1,8 @@
-Copyright (C) 2016--2016 Francis Tyers <[email protected]>
-Copyright (C) 2016--2021 Gianfranco Fronteddu <[email protected]>
-Copyright (C) 2016--2021 Hèctor Alòs i Font <[email protected]>
+2016-2021, Hèctor Alòs i Font <[email protected]>
+2016-2020, Gianfranco Fronteddu <[email protected]>
+2020, Nick Howell <[email protected]>
+2016-2018, Francis M. Tyers <[email protected]>
+2018, Sushain Cherivirala <[email protected]>
+2016-2017, Tino Didriksen <[email protected]>
+2016, Frankie Robertson <[email protected]>
+2016, Kevin Brubeck Unhammer <[email protected]>

Makefile.am

@@ -2,8 +2,6 @@
 ## Makefile for apertium-srd
 ###############################################################################
 
-RELEASE=1.2
-VERSION=1.2.0
 LANG1=srd
 BASENAME=apertium-$(LANG1)
 
@@ -60,8 +58,8 @@ $(LANG1).autopgen.bin: $(BASENAME).post-$(LANG1).dix
 ## Disambiguation rules
 ###############################################################################
 
-$(LANG1).rlx.bin: $(BASENAME).$(LANG1).rlx $(CGCOMP)
-	$(CGCOMP) $< $@
+$(LANG1).rlx.bin: $(BASENAME).$(LANG1).rlx
+	cg-comp $< $@
 
 ###############################################################################
 ## Distribution
@@ -81,26 +79,18 @@ EXTRA_DIST=$(BASENAME).$(LANG1).dix		\
 #   apertium_srd_srcdir: This is where the source files go
 
 apertium_srddir=$(prefix)/share/apertium/$(BASENAME)/
-apertium_srd_srcdir=$(prefix)/share/apertium/$(BASENAME)/
 
-apertium_srd_DATA=$(TARGETS_COMMON) $(LANG1).prob
+apertium_srd_DATA=$(TARGETS_COMMON) $(LANG1).prob \
+	$(BASENAME).$(LANG1).dix \
+	$(BASENAME).$(LANG1).rlx \
+	$(BASENAME).post-$(LANG1).dix
 
 pkgconfigdir = $(prefix)/share/pkgconfig
 pkgconfig_DATA = $(BASENAME).pc
 
-# Modes are not installed since they're all just "debug modes". All
-# modes are created by this goal.
-modes/$(LANG1)-morph.mode: modes.xml
-	apertium-validate-modes modes.xml
-	apertium-gen-modes modes.xml
-
 noinst_DATA=modes/$(LANG1)-morph.mode
 
 install-data-local: install-modes
-	test -d $(DESTDIR)$(apertium_srd_srcdir) || mkdir -p $(DESTDIR)$(apertium_srd_srcdir)
-	$(INSTALL_DATA) $(BASENAME).$(LANG1).dix $(DESTDIR)$(apertium_srd_srcdir)
-	$(INSTALL_DATA) $(BASENAME).$(LANG1).rlx $(DESTDIR)$(apertium_srd_srcdir)
-	$(INSTALL_DATA) $(BASENAME).post-$(LANG1).dix $(DESTDIR)$(apertium_srd_srcdir)
 
 CLEANFILES = $(TARGETS_COMMON)
 clean-local:
@@ -115,4 +105,3 @@ test: all
 	@echo "TODO test analysis results" > .test-ref
 	@diff .test-ref .test-mt
 	@rm .test-ref .test-mt
-

apertium-srd.pc.in

@@ -3,6 +3,5 @@ exec_prefix=${prefix}
 srcdir=@datarootdir@/apertium/apertium-srd
 
 Name: apertium-srd
-Description: Finite-state morphological transducer and constraint grammar for Sardinian 
+Description: Finite-state morphological transducer and constraint grammar for Sardinian
 Version: @VERSION@
-

configure.ac

@@ -1,21 +1,13 @@
 AC_PREREQ(2.52)
 
-AC_INIT([apertium-srd], [1.3.0], [[email protected]])
-AM_INIT_AUTOMAKE([apertium-srd], [1.3.0], no-define)
-AC_PROG_LN_S
+AC_INIT([apertium-srd], [1.3.0], [[email protected]])
+AM_INIT_AUTOMAKE
 AC_PROG_AWK
 
-m4_define([required_apertium_version], [3.3.0])
-m4_define([required_lttolbox_version], [3.3.0])
-
-PKG_CHECK_MODULES(APERTIUM, apertium >= required_apertium_version)
-PKG_CHECK_MODULES(LTTOOLBOX, lttoolbox >= required_lttolbox_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])])
-
+PKG_CHECK_MODULES(APERTIUM, apertium >= 3.7.1)
+PKG_CHECK_MODULES(LTTOOLBOX, lttoolbox >= 3.5.3)
+PKG_CHECK_MODULES(CG3, cg3 >= 1.3.2)
 
 AP_MKINCLUDE
 
 AC_OUTPUT([Makefile apertium-srd.pc])
-