diff --git a/linux/kmflcomp/NEWS b/linux/kmflcomp/NEWS deleted file mode 120000 index b0936e8d00..0000000000 --- a/linux/kmflcomp/NEWS +++ /dev/null @@ -1 +0,0 @@ -ChangeLog \ No newline at end of file diff --git a/linux/kmflcomp/NEWS b/linux/kmflcomp/NEWS new file mode 100644 index 0000000000..6b36eb5c64 --- /dev/null +++ b/linux/kmflcomp/NEWS @@ -0,0 +1,6 @@ +10.99 +----- + +kmflcomp now supports special stores added since Keyman version 6.0. +However it does not support the newer syntax. +Keyboards for Keyman > 6.0 which only use older syntax should compile diff --git a/linux/kmflcomp/debian/changelog b/linux/kmflcomp/debian/changelog index 8341d4330a..849be564ad 100644 --- a/linux/kmflcomp/debian/changelog +++ b/linux/kmflcomp/debian/changelog @@ -1,12 +1,17 @@ -kmflcomp (10.99.1-1) UNRELEASED; urgency=medium +kmflcomp (10.99.32-1) experimental; urgency=medium * Change license to MIT as kmflcomp is being moved into Keyman 11 * Keyman is now owned by SIL * new upstream pre-release - add new symbols to d/libkmflcomp0.symbols * d/control remove build-dep on autotools-dev (compat 10) + update webpage + * New upstream pre-release + * added symbols in libkmflcomp0 so will require transition + * I am now the maintainer as I am the one working + on Keyman for Linux upstream - -- Daniel Glassey Wed, 29 Aug 2018 16:37:58 +0700 + -- Daniel Glassey Tue, 16 Oct 2018 13:09:24 +0700 kmflcomp (0.9.10-1) unstable; urgency=low diff --git a/linux/kmflcomp/kmfl_compiler/Makefile.am b/linux/kmflcomp/kmfl_compiler/Makefile.am index 05a75a4ad5..d46a1b7ff3 100644 --- a/linux/kmflcomp/kmfl_compiler/Makefile.am +++ b/linux/kmflcomp/kmfl_compiler/Makefile.am @@ -16,6 +16,4 @@ bin_PROGRAMS = kmflcomp kmflcomp_SOURCES = \ kmfl_compiler.c -kmflcomp_LDFLAGS = -lX11 -L/usr/X11R6/lib -Wl,--no-as-needed - -kmflcomp_LDADD = ../src/.libs/libkmflcomp.a +kmflcomp_LDADD = ../src/libkmflcomp.la diff --git a/linux/kmflcomp/src/Makefile.am b/linux/kmflcomp/src/Makefile.am index 46f43e8c14..c1d1ce3917 100644 --- a/linux/kmflcomp/src/Makefile.am +++ b/linux/kmflcomp/src/Makefile.am @@ -22,8 +22,8 @@ libkmflcomp_la_SOURCES = \ EXTRA_DIST = compiler.h memman.h -libkmflcomp_la_LDFLAGS = -lX11 -L/usr/X11R6/lib -Wl,--no-as-needed -version-info 1:0:1 +libkmflcomp_la_LDFLAGS = -Wl,--no-as-needed -version-info 1:0:1 -libkmflcomp_la_LIBADD = +libkmflcomp_la_LIBADD = -L/usr/X11R6/lib -lX11 AM_YFLAGS = -d diff --git a/linux/scripts/launchpad.sh b/linux/scripts/launchpad.sh index 78c3ce1d46..d5cb25d600 100755 --- a/linux/scripts/launchpad.sh +++ b/linux/scripts/launchpad.sh @@ -44,6 +44,7 @@ for proj in ${projects}; do cd ${proj} if [ "${proj}" == "keyman-config" ]; then tarname="keyman_config" + make clean else tarname="${proj}" fi