From 8f9fd13f9990ffaa231f1ce3792836321cf15f38 Mon Sep 17 00:00:00 2001 From: glasseyes Date: Fri, 19 Oct 2018 11:03:26 +0700 Subject: [PATCH 1/4] [linux] changelog for kmflcomp upload to experimental --- linux/kmflcomp/debian/changelog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/linux/kmflcomp/debian/changelog b/linux/kmflcomp/debian/changelog index 8341d4330a..bcc5f217bd 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 From f93208477549263610ac6f29d475684c675868d3 Mon Sep 17 00:00:00 2001 From: glasseyes Date: Wed, 17 Oct 2018 13:14:17 +0700 Subject: [PATCH 2/4] [linux] clean keyman-config before launchpad build --- linux/scripts/launchpad.sh | 1 + 1 file changed, 1 insertion(+) 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 From 8eaeee506caa13fc97cc2fb75cecc85bfb1f77ef Mon Sep 17 00:00:00 2001 From: glasseyes Date: Fri, 19 Oct 2018 11:12:47 +0700 Subject: [PATCH 3/4] [linux] separate NEWS file for kmflcomp lintian complains if it is same as the Changelog --- linux/kmflcomp/NEWS | 7 ++++++- linux/kmflcomp/debian/changelog | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) mode change 120000 => 100644 linux/kmflcomp/NEWS 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 bcc5f217bd..849be564ad 100644 --- a/linux/kmflcomp/debian/changelog +++ b/linux/kmflcomp/debian/changelog @@ -5,7 +5,7 @@ kmflcomp (10.99.32-1) experimental; urgency=medium * new upstream pre-release - add new symbols to d/libkmflcomp0.symbols * d/control remove build-dep on autotools-dev (compat 10) - update webpage + 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 From 551efa5822aa29e322609c08dff5fd9dbe8f3c62 Mon Sep 17 00:00:00 2001 From: glasseyes Date: Fri, 19 Oct 2018 14:04:54 +0700 Subject: [PATCH 4/4] [linux] linked libs in LIBADD not LDFLAGS fixes Debian bug #616572 --- linux/kmflcomp/kmfl_compiler/Makefile.am | 4 +--- linux/kmflcomp/src/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) 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