[uctodata] 01/04: New upstream version 0.4
Maarten van Gompel
proycon-guest at moszumanska.debian.org
Mon Jan 23 13:44:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
proycon-guest pushed a commit to branch master
in repository uctodata.
commit 423337fe0ef3293367afcf85514bd84084677769
Author: proycon <proycon at anaproy.nl>
Date: Mon Jan 23 05:18:33 2017 +0100
New upstream version 0.4
---
ChangeLog | 51 ++++++++++++++++++++++++++++++++++++---------------
Makefile.in | 9 ++++-----
config/Makefile.am | 23 +----------------------
config/Makefile.in | 45 +++++++++++----------------------------------
config/tokconfig-nld | 4 ++--
configure | 34 +++++++++++-----------------------
configure.ac | 2 +-
install-sh | 23 ++++++++---------------
8 files changed, 74 insertions(+), 117 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5a9db33..7f474bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2017-01-23 Maarten van Gompel <proycon at anaproy.nl>
+
+ * README.md: README update
+
+2017-01-23 Maarten van Gompel <proycon at anaproy.nl>
+
+ * README.md: updated README
+
+2017-01-23 Ko van der Sloot <K.vanderSloot at let.ru.nl>
+
+ * config/Makefile.am: from now on we install the datafiles in
+ $PREFIX/share/ucto
+
+2017-01-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
+
+ * config/tokconfig-nld: added more patterns to DATE
+
+2017-01-06 Ko van der Sloot <K.vanderSloot at let.ru.nl>
+
+ * configure.ac: bumped version after release
+
2017-01-06 Ko van der Sloot <K.vanderSloot at let.ru.nl>
* NEWS: NEWS for the release
@@ -91,21 +112,21 @@
2016-10-12 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * config/Makefile.am, config/es.abr, config/nl_afk.abr,
- config/nld_afk.abr, config/por.abr, config/pt.abr, config/spa.abr,
- config/tokconfig-de, config/tokconfig-deu, config/tokconfig-en,
- config/tokconfig-eng, config/tokconfig-es, config/tokconfig-fr,
- config/tokconfig-fra, config/tokconfig-fry, config/tokconfig-fy,
- config/tokconfig-generic, config/tokconfig-it,
- config/tokconfig-ita, config/tokconfig-nl,
- config/tokconfig-nl-sonarchat, config/tokconfig-nl-twitter,
- config/tokconfig-nl-withplaceholder, config/tokconfig-nld,
- config/tokconfig-nld-sonarchat, config/tokconfig-nld-twitter,
- config/tokconfig-nld-withplaceholder, config/tokconfig-por,
- config/tokconfig-pt, config/tokconfig-ru, config/tokconfig-rus,
- config/tokconfig-spa, config/tokconfig-sv, config/tokconfig-swe,
- config/tokconfig-tr, config/tokconfig-tur, configure.ac: use ISO
- 693-3 language codes. But preserve old versions as symlinks
+ * config/Makefile.am, config/{nl_afk.abr => nld_afk.abr},
+ config/{pt.abr => por.abr}, config/{es.abr => spa.abr},
+ config/{tokconfig-de => tokconfig-deu}, config/{tokconfig-en =>
+ tokconfig-eng}, config/{tokconfig-fr => tokconfig-fra},
+ config/{tokconfig-fy => tokconfig-fry}, config/tokconfig-generic,
+ config/{tokconfig-it => tokconfig-ita}, config/{tokconfig-nl =>
+ tokconfig-nld}, config/{tokconfig-nl-sonarchat =>
+ tokconfig-nld-sonarchat}, config/{tokconfig-nl-twitter =>
+ tokconfig-nld-twitter}, config/{tokconfig-nl-withplaceholder =>
+ tokconfig-nld-withplaceholder}, config/{tokconfig-pt =>
+ tokconfig-por}, config/{tokconfig-ru => tokconfig-rus},
+ config/{tokconfig-es => tokconfig-spa}, config/{tokconfig-sv =>
+ tokconfig-swe}, config/{tokconfig-tr => tokconfig-tur},
+ configure.ac: use ISO 693-3 language codes. But preserve old
+ versions as symlinks
2016-09-28 Ko van der Sloot <K.vanderSloot at let.ru.nl>
diff --git a/Makefile.in b/Makefile.in
index f007a73..87e3b46 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -294,7 +294,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -538,7 +537,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
@@ -564,7 +563,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -582,7 +581,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -592,7 +591,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff --git a/config/Makefile.am b/config/Makefile.am
index ce2d3b0..62461af 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -6,27 +6,6 @@ config_DATA = tokconfig-eng tokconfig-nld tokconfig-fra tokconfig-ita \
exotic-quotes.quote exotic-eos.eos \
nld_afk.abr spa.abr por.abr
-configdir = $(sysconfdir)/ucto
+configdir = $(datadir)/ucto
EXTRA_DIST = $(config_DATA)
-
-install-data-hook:
-# for backward compatability add symlinks with 'historical' names
- cd $(DESTDIR)$(configdir) && \
- $(LN_S) -f tokconfig-eng tokconfig-en && \
- $(LN_S) -f tokconfig-deu tokconfig-de && \
- $(LN_S) -f tokconfig-nld tokconfig-nl && \
- $(LN_S) -f tokconfig-fra tokconfig-fr && \
- $(LN_S) -f tokconfig-spa tokconfig-es && \
- $(LN_S) -f tokconfig-ita tokconfig-it && \
- $(LN_S) -f tokconfig-por tokconfig-pt && \
- $(LN_S) -f tokconfig-swe tokconfig-sv && \
- $(LN_S) -f tokconfig-rus tokconfig-ru && \
- $(LN_S) -f tokconfig-tur tokconfig-tr && \
- $(LN_S) -f tokconfig-fry tokconfig-fy && \
- $(LN_S) -f tokconfig-nld-twitter tokconfig-nl-twitter && \
- $(LN_S) -f tokconfig-nld-sonarchat tokconfig-nl-sonarchat && \
- $(LN_S) -f tokconfig-nld-withplaceholder tokconfig-nl-withplaceholder && \
- $(LN_S) -f nld_afk.abr nl_afk.abr && \
- $(LN_S) -f spa.abr es.abr && \
- $(LN_S) -f por.abr pt.abr
diff --git a/config/Makefile.in b/config/Makefile.in
index f06dea9..555df5a 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -212,7 +212,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -229,7 +228,7 @@ config_DATA = tokconfig-eng tokconfig-nld tokconfig-fra tokconfig-ita \
exotic-quotes.quote exotic-eos.eos \
nld_afk.abr spa.abr por.abr
-configdir = $(sysconfdir)/ucto
+configdir = $(datadir)/ucto
EXTRA_DIST = $(config_DATA)
all: all-am
@@ -379,8 +378,7 @@ info: info-am
info-am:
install-data-am: install-configDATA
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
install-dvi: install-dvi-am
install-dvi-am:
@@ -425,44 +423,23 @@ ps-am:
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-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 maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
- uninstall-am uninstall-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-configDATA
.PRECIOUS: Makefile
-install-data-hook:
-# for backward compatability add symlinks with 'historical' names
- cd $(DESTDIR)$(configdir) && \
- $(LN_S) -f tokconfig-eng tokconfig-en && \
- $(LN_S) -f tokconfig-deu tokconfig-de && \
- $(LN_S) -f tokconfig-nld tokconfig-nl && \
- $(LN_S) -f tokconfig-fra tokconfig-fr && \
- $(LN_S) -f tokconfig-spa tokconfig-es && \
- $(LN_S) -f tokconfig-ita tokconfig-it && \
- $(LN_S) -f tokconfig-por tokconfig-pt && \
- $(LN_S) -f tokconfig-swe tokconfig-sv && \
- $(LN_S) -f tokconfig-rus tokconfig-ru && \
- $(LN_S) -f tokconfig-tur tokconfig-tr && \
- $(LN_S) -f tokconfig-fry tokconfig-fy && \
- $(LN_S) -f tokconfig-nld-twitter tokconfig-nl-twitter && \
- $(LN_S) -f tokconfig-nld-sonarchat tokconfig-nl-sonarchat && \
- $(LN_S) -f tokconfig-nld-withplaceholder tokconfig-nl-withplaceholder && \
- $(LN_S) -f nld_afk.abr nl_afk.abr && \
- $(LN_S) -f spa.abr es.abr && \
- $(LN_S) -f por.abr pt.abr
-
# 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/tokconfig-nld b/config/tokconfig-nld
index d405426..0670097 100644
--- a/config/tokconfig-nld
+++ b/config/tokconfig-nld
@@ -82,8 +82,8 @@ PUNCTUATION-MULTI-DOT=(?:\-|_|\*|=|!|<|>|\?){2,}(\.)
PUNCTUATION-MULTI=(?:(?:\-|_|\*|=|!|<|>|\?){2,})|(?:\.){2,}
#Date
-DATE=\p{N}{1,2}-\p{N}{1,2}-\p{N}{2,4}
-DATE-REVERSE=\p{N}{4}-\p{N}{1,2}-\p{N}{1,2}
+DATE=\p{N}{1,2}[-\.]\p{N}{1,2}[-\.]['’‘´\`]?\p{N}{2,4}
+DATE-REVERSE=\p{N}{4}[-\.]\p{N}{1,2}[-\.]\p{N}{1,2}
FRACNUMBER=\p{N}+(?:/\p{N}+)+
diff --git a/configure b/configure
index 83e0b81..a43c19e 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 uctodata 0.3.1.
+# Generated by GNU Autoconf 2.69 for uctodata 0.4.
#
# Report bugs to <lamasoftware at science.ru.nl>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='uctodata'
PACKAGE_TARNAME='uctodata'
-PACKAGE_VERSION='0.3.1'
-PACKAGE_STRING='uctodata 0.3.1'
+PACKAGE_VERSION='0.4'
+PACKAGE_STRING='uctodata 0.4'
PACKAGE_BUGREPORT='lamasoftware at science.ru.nl'
PACKAGE_URL=''
@@ -634,7 +634,6 @@ infodir
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -700,7 +699,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -953,15 +951,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1099,7 +1088,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1212,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 uctodata 0.3.1 to adapt to many kinds of systems.
+\`configure' configures uctodata 0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1241,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1279,7 +1267,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of uctodata 0.3.1:";;
+ short | recursive ) echo "Configuration of uctodata 0.4:";;
esac
cat <<\_ACEOF
@@ -1353,7 +1341,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-uctodata configure 0.3.1
+uctodata configure 0.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1370,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 uctodata $as_me 0.3.1, which was
+It was created by uctodata $as_me 0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2233,7 +2221,7 @@ fi
# Define the identity of the package.
PACKAGE='uctodata'
- VERSION='0.3.1'
+ VERSION='0.4'
cat >>confdefs.h <<_ACEOF
@@ -2892,7 +2880,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 uctodata $as_me 0.3.1, which was
+This file was extended by uctodata $as_me 0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2945,7 +2933,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="\\
-uctodata config.status 0.3.1
+uctodata config.status 0.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 72ec1ee..7144f2e 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([uctodata], [0.3.1], [lamasoftware at science.ru.nl])
+AC_INIT([uctodata], [0.4], [lamasoftware at science.ru.nl])
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([configure.ac])
AC_PROG_LN_S
diff --git a/install-sh b/install-sh
index 59990a1..0b0fdcb 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2014-09-12.12; # UTC
+scriptversion=2013-12-25.23; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -324,41 +324,34 @@ do
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
- # $RANDOM is not portable (e.g. dash); use it when possible to
- # lower collision chance
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
- # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
- # create the $tmpdir first (and fail if unsuccessful) to make sure
- # that nobody tries to guess the $tmpdir name.
if (umask $mkdir_umask &&
- $mkdirprog $mkdir_mode "$tmpdir" &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- test_tmpdir="$tmpdir/a"
- ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+ rmdir "$tmpdir/d" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
fi
trap '' 0;;
esac;;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/uctodata.git
More information about the debian-science-commits
mailing list