From 4d3a88eb1abff5f7ab4f953fb400a3cc45cdac73 Mon Sep 17 00:00:00 2001
From: glasseyes <dglassey@gmail.com>
Date: Mon, 3 Sep 2018 17:16:41 +0700
Subject: [PATCH] also build keyman-config package

---
 linux/Makefile               |  4 +++-
 linux/deb.sh                 | 34 +++++++++++++++++++++++++++-------
 linux/keyman-config/Makefile |  5 ++++-
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/linux/Makefile b/linux/Makefile
index a98d29572f..f3eedd139a 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -9,8 +9,10 @@ install_local:
 uninstall_local:
 	SUDOINSTALL="uninstall" ./build.sh
 
-deb: cow
+debnocow:
 	./deb.sh
 
+deb: cow debnocow
+
 cow:
 	./cow.sh
\ No newline at end of file
diff --git a/linux/deb.sh b/linux/deb.sh
index 5452820d73..d4508fd4a0 100755
--- a/linux/deb.sh
+++ b/linux/deb.sh
@@ -7,15 +7,18 @@
 
 set -e
 
-distributions='bionic xenial'
-projects='kmflcomp libkmfl ibus-kmfl'
+distributions="bionic xenial"
+autotool_projects="kmflcomp libkmfl ibus-kmfl"
+all_projects="${autotool_projects} keyman-config"
 echo "distributions: ${distributions}"
+echo "autotool_projects: ${autotool_projects}"
+echo "all_projects: ${all_projects}"
 
 declare -A proj_versions=()
 BASEDIR=`pwd`
 
 # autoreconf the projects
-for proj in ${projects}; do
+for proj in ${autotool_projects}; do
 	cd $proj
 	echo "Reconfiguring $proj"
 	autoreconf
@@ -26,7 +29,7 @@ mkdir -p builddebs
 mkdir -p builddebs/xenial
 mkdir -p builddebs/bionic
 
-for proj in ${projects}; do
+for proj in ${autotool_projects}; do
 	rm -rf deb-$proj
 	mkdir deb-$proj
 	cd deb-$proj
@@ -40,18 +43,35 @@ for proj in ${projects}; do
 	cd ${BASEDIR}
 done
 
-echo ${proj_versions}
+cd keyman-config
+rm -rf dist make_deb build
+python3 setup.py egg_info -b.`date -u +"%Y%m%d%H%M%S"` sdist
+cd dist
+ls *.tar.gz
+tmp=`basename *.tar.gz .tar.gz`
+origname=${tmp/keyman\_config-/keyman-config\_}
+index=`expr index "${origname}" _`
+proj_versions[keyman-config]=${tmp:$index}
+kcversion=${proj_versions[keyman-config]}
 
+echo "keyman-config version: ${kcversion}"
 
-for proj in ${projects}; do
+tar xf keyman_config-${kcversion}.tar.gz
+mv keyman_config-${kcversion} keyman-config-${kcversion}
+tar cfz keyman-config_${kcversion}.orig.tar.gz keyman-config-${kcversion}
+
+cp keyman-config_${kcversion}.orig.tar.gz ${BASEDIR}/builddebs/
+cd ${BASEDIR}
+
+for proj in ${all_projects}; do
 	cd builddebs
 	echo "$proj version ${proj_versions[$proj]}"
 	rm -rf ${proj}-${proj_versions[$proj]}
 	tar xfz ${proj}_${proj_versions[$proj]}.orig.tar.gz
 	cp -a ../$proj/debian ${proj}-${proj_versions[$proj]}
 	cd ${proj}-${proj_versions[$proj]}
-	dch -v ${proj_versions[$proj]}-1${dist} "local build"
 	for dist in ${distributions}; do
+		dch -v ${proj_versions[$proj]}-1${dist} "local build"
 		echo "$dist"
 		pdebuild --pbuilder cowbuilder --buildresult /var/cache/pbuilder/result/${dist} -- --basepath /var/cache/pbuilder/base-${dist}.cow --distribution ${dist} --override-config --othermirror="deb [trusted=yes] file:/var/cache/pbuilder/result/${dist} ./" --bindmounts /var/cache/pbuilder/result/${dist}  --hookdir /var/cache/pbuilder/hook.d/${dist}
 	done
diff --git a/linux/keyman-config/Makefile b/linux/keyman-config/Makefile
index f17e8a2858..5cb2d8f150 100644
--- a/linux/keyman-config/Makefile
+++ b/linux/keyman-config/Makefile
@@ -11,10 +11,13 @@ install:
 clean:
 	-rm -rf dist make_deb build
 
+devdist:
+	python3 setup.py egg_info -b.`date -u +"%Y%m%d%H%M%S"` sdist
+
 dist: clean
 	python3 setup.py sdist
 
-deb: clean dist man
+deb: clean devdist man
 	-mkdir make_deb
 	cd make_deb && tar xf ../dist/keyman_config-$(VERSION).tar.gz && \
 		mv keyman_config-$(VERSION) keyman-config-$(VERSION) && \