[frogdata] 01/03: New upstream version 0.13
Maarten van Gompel
proycon-guest at moszumanska.debian.org
Mon Jan 23 15:08:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
proycon-guest pushed a commit to branch master
in repository frogdata.
commit 2c1d49d0341aa2f2651f689d31ab6ad2831c0931
Author: proycon <proycon at anaproy.nl>
Date: Mon Jan 23 16:01:13 2017 +0100
New upstream version 0.13
---
README | 2 +-
config/nld/Makefile.am | 13 +----------
config/nld/Makefile.in | 63 ++++++++++++--------------------------------------
config/nld/frog.cfg | 2 +-
configure | 20 ++++++++--------
configure.ac | 2 +-
6 files changed, 29 insertions(+), 73 deletions(-)
diff --git a/README b/README
index 15b287a..0bd6a9a 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-frogdata 0.9 CLST/ILK/CLiPS 1998 - 2016
+frogdata 0.9 CLST/ILK/CLiPS 1998 - 2017
https://github.com/LanguageMachines/frogdata/
documentation: https://languagemachines.github.io/frog
diff --git a/config/nld/Makefile.am b/config/nld/Makefile.am
index 91d2ef4..e2d5d85 100644
--- a/config/nld/Makefile.am
+++ b/config/nld/Makefile.am
@@ -37,17 +37,6 @@ config_DATA = mblem.transtable mblem.tree mblem.tree.wgt \
striptokens.txt \
frog.cfg
-configdir = $(sysconfdir)/frog/nld
-
-# for backward compatability we also install dutch in
-# the parent dir!
-
-config2_DATA = $(config_DATA)
-config2dir = $(sysconfdir)/frog
+configdir = $(datadir)/frog/nld
EXTRA_DIST = $(config_DATA)
-
-install-data-hook:
-# for backward compatability we add a symlink to a 'nl' dir
- cd $(DESTDIR)$(config2dir) && \
- $(LN_S) -f nld nl
diff --git a/config/nld/Makefile.in b/config/nld/Makefile.in
index d4167fb..e6b4e04 100644
--- a/config/nld/Makefile.in
+++ b/config/nld/Makefile.in
@@ -141,8 +141,8 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(configdir)" "$(DESTDIR)$(config2dir)"
-DATA = $(config_DATA) $(config2_DATA)
+am__installdirs = "$(DESTDIR)$(configdir)"
+DATA = $(config_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -259,12 +259,7 @@ config_DATA = mblem.transtable mblem.tree mblem.tree.wgt \
striptokens.txt \
frog.cfg
-configdir = $(sysconfdir)/frog/nld
-
-# for backward compatability we also install dutch in
-# the parent dir!
-config2_DATA = $(config_DATA)
-config2dir = $(sysconfdir)/frog
+configdir = $(datadir)/frog/nld
EXTRA_DIST = $(config_DATA)
all: all-am
@@ -319,27 +314,6 @@ uninstall-configDATA:
@list='$(config_DATA)'; test -n "$(configdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
-install-config2DATA: $(config2_DATA)
- @$(NORMAL_INSTALL)
- @list='$(config2_DATA)'; test -n "$(config2dir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(config2dir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(config2dir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(config2dir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(config2dir)" || exit $$?; \
- done
-
-uninstall-config2DATA:
- @$(NORMAL_UNINSTALL)
- @list='$(config2_DATA)'; test -n "$(config2dir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(config2dir)'; $(am__uninstall_files_from_dir)
tags TAGS:
ctags CTAGS:
@@ -381,7 +355,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(configdir)" "$(DESTDIR)$(config2dir)"; do \
+ for dir in "$(DESTDIR)$(configdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -434,9 +408,8 @@ info: info-am
info-am:
-install-data-am: install-config2DATA install-configDATA
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-data-am: install-configDATA
+
install-dvi: install-dvi-am
install-dvi-am:
@@ -479,31 +452,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-config2DATA uninstall-configDATA
+uninstall-am: uninstall-configDATA
-.MAKE: install-am install-data-am install-strip
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
ctags-am distclean distclean-generic distdir dvi dvi-am html \
- html-am info info-am install install-am install-config2DATA \
- install-configDATA install-data install-data-am \
- install-data-hook install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ html-am info info-am install install-am install-configDATA \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags-am uninstall uninstall-am \
- uninstall-config2DATA uninstall-configDATA
+ uninstall-configDATA
.PRECIOUS: Makefile
-install-data-hook:
-# for backward compatability we add a symlink to a 'nl' dir
- cd $(DESTDIR)$(config2dir) && \
- $(LN_S) -f nld nl
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/config/nld/frog.cfg b/config/nld/frog.cfg
index 6a2724b..b85a4df 100644
--- a/config/nld/frog.cfg
+++ b/config/nld/frog.cfg
@@ -47,7 +47,7 @@ set="http://ilk.uvt.nl/folia/sets/frog-mbma-nl"
#debug=0
[[tokenizer]]
-rulesFile="tokconfig-nl"
+rulesFile="tokconfig-nld"
[[parser]]
pairsFile=Frog.mbdp.1.0.pairs.sampled.ibase
diff --git a/configure b/configure
index a1cf025..b721190 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for frogdata 0.12.1.
+# Generated by GNU Autoconf 2.69 for frogdata 0.13.
#
# Report bugs to <lamasoftware at science.ru.nl>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='frogdata'
PACKAGE_TARNAME='frogdata'
-PACKAGE_VERSION='0.12.1'
-PACKAGE_STRING='frogdata 0.12.1'
+PACKAGE_VERSION='0.13'
+PACKAGE_STRING='frogdata 0.13'
PACKAGE_BUGREPORT='lamasoftware at science.ru.nl'
PACKAGE_URL=''
@@ -1201,7 +1201,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures frogdata 0.12.1 to adapt to many kinds of systems.
+\`configure' configures frogdata 0.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1267,7 +1267,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of frogdata 0.12.1:";;
+ short | recursive ) echo "Configuration of frogdata 0.13:";;
esac
cat <<\_ACEOF
@@ -1341,7 +1341,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-frogdata configure 0.12.1
+frogdata configure 0.13
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1358,7 +1358,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by frogdata $as_me 0.12.1, which was
+It was created by frogdata $as_me 0.13, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2221,7 +2221,7 @@ fi
# Define the identity of the package.
PACKAGE='frogdata'
- VERSION='0.12.1'
+ VERSION='0.13'
cat >>confdefs.h <<_ACEOF
@@ -2881,7 +2881,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by frogdata $as_me 0.12.1, which was
+This file was extended by frogdata $as_me 0.13, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2934,7 +2934,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-frogdata config.status 0.12.1
+frogdata config.status 0.13
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 1d2c716..0d0dacd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([frogdata], [0.12.1], [lamasoftware at science.ru.nl])
+AC_INIT([frogdata], [0.13], [lamasoftware at science.ru.nl])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([configure.ac])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/frogdata.git
More information about the debian-science-commits
mailing list