From b8a4dc18e3591a44a16d876a2331341dfdc0eac5 Mon Sep 17 00:00:00 2001
From: Christoffer Sandberg <cs@tuxedo.de>
Date: Tue, 19 May 2020 16:06:57 +0200
Subject: [PATCH] Update version & changelog

Plus.. suppress output from sed when building. Note, sed is only
used for packaging and otherwise irrelevant. However, it should not
look like an error.
---
 .gitignore                                      |   2 ++
 Makefile                                        |   6 +++---
 .../usr/share/doc/module-name/changelog.gz      | Bin 243 -> 309 bytes
 dkms.conf                                       |   2 +-
 src/tuxedo_keyboard.c                           |   2 +-
 src_pkg/rpm_pkg.spec                            |   4 ++++
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e181af..0adeb91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,8 @@ modules.order
 Module.symvers
 Mkfile.old
 
+*.mk
+
 .vscode/
 
 # Packaging
diff --git a/Makefile b/Makefile
index 69e2631..a91b6bf 100644
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,8 @@ install:
 	make -C $(KDIR) M=$(PWD) modules_install
 
 # Package version and name from dkms.conf
-VER := $(shell sed -n 's/^PACKAGE_VERSION=\([^\n]*\)/\1/p' dkms.conf)
-MODULE_NAME := $(shell sed -n 's/^PACKAGE_NAME=\([^\n]*\)/\1/p' dkms.conf)
+VER := $(shell sed -n 's/^PACKAGE_VERSION=\([^\n]*\)/\1/p' dkms.conf 2>&1 /dev/null)
+MODULE_NAME := $(shell sed -n 's/^PACKAGE_NAME=\([^\n]*\)/\1/p' dkms.conf 2>&1 /dev/null)
 
 dkmsinstall:
 	cp -R . /usr/src/$(MODULE_NAME)-$(VER)
@@ -99,7 +99,7 @@ package-deb-clean:
 RPM_PACKAGE_NAME := $(MODULE_NAME)-$(VER)
 RPM_PACKAGE_SRC := rpm/SOURCES/$(RPM_PACKAGE_NAME)
 RPM_SPEC := rpm/SPECS/$(MODULE_NAME).spec
-RELEASE := 0
+RELEASE := 1
 
 package-rpm:
 	# Create folder source structure according to current version
diff --git a/deb/module-name/usr/share/doc/module-name/changelog.gz b/deb/module-name/usr/share/doc/module-name/changelog.gz
index 8166d675a97553add1427b853860e8a95723d90e..124ede66caf9af482edeb3905a257ab4800af2ad 100644
GIT binary patch
literal 309
zcmV-50m}X#iwFpJ<-=YA17m1mZf9j|Z)X6NkjqZPFc3xe`HH*bmB>jOP{Tu12w1@e
z_Q;8+Y1G7HIW}$o9w)T0DMH<i?#yV;8Rs{oI9}1VWN8&nvP2}4Q<M$srn-i=HR)=5
z+wwXB&hSi{tZWe$K%b-?I%!O!YxLe2wr-qy96CLuQlzk8i&9prwyBp6QY$$2)zU~6
zMTlcO;4OqD*%~*_Z|>cQRB>m#BikpTx&z)lT_By|MQ)LaOd!pRJTHX6xk!bGB6r9n
z``hHH*+8>{rQWd}4V-iY)<fhw`kCrj`IaEP<CdjD)AyeGu{~F6Skr2_Sg~F-HNHVU
z_8`d+2W6P>16kAY(o@Wh-APXhG5b$CJuE!}ztVaK5{!>WxeEW^qg)pG^cUp|OR>UW
HNdf=>wb7Lh

literal 243
zcmV<P01W>hiwFo`ot0h!17m1mZf9j|Z)X6Nk4;a*Fc3uV{uOhiKq4m;5Gf!kByMnl
zd*#@RWi|0e{!rV0PZB6xdf_^|PxB__JsB>xbZA)xgR{DnWxYV_*gL&K4wk$=JaoJh
zz&T#r9-b2d#l*pRi<nd*u%Dvb)9+W$CU*pt6L+i(T#T9Gd|n$fVctxQn*FD<NVCZ1
zC{j)_5@S$$t1JnDqQEoWN2;Y@aX$i2-;m~h$caK6q5cv0$aINniS-ar%UYtkYUEub
tB`#zor4Z@V=<4+7S@?~1KO*De|Et{MRUK7sn(O7C$`^gSb%lQc00059a!&vN

diff --git a/dkms.conf b/dkms.conf
index 1c4ab76..6312e3f 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME=tuxedo-keyboard
-PACKAGE_VERSION=2.0.2
+PACKAGE_VERSION=2.0.3
 
 DEST_MODULE_LOCATION[0]="/kernel/lib/"
 BUILT_MODULE_NAME[0]="tuxedo_keyboard"
diff --git a/src/tuxedo_keyboard.c b/src/tuxedo_keyboard.c
index a687910..d8c9175 100644
--- a/src/tuxedo_keyboard.c
+++ b/src/tuxedo_keyboard.c
@@ -36,7 +36,7 @@
 MODULE_AUTHOR("TUXEDO Computers GmbH <tux@tuxedocomputers.com>");
 MODULE_DESCRIPTION("TUXEDO Computers Keyboard & Backlight Driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("2.0.2");
+MODULE_VERSION("2.0.3");
 
 MODULE_ALIAS("wmi:" CLEVO_EVENT_GUID);
 MODULE_ALIAS("wmi:" CLEVO_GET_GUID);
diff --git a/src_pkg/rpm_pkg.spec b/src_pkg/rpm_pkg.spec
index 44cb093..5344445 100644
--- a/src_pkg/rpm_pkg.spec
+++ b/src_pkg/rpm_pkg.spec
@@ -100,6 +100,10 @@ exit 0
 
 
 %changelog
+* Tue May 19 2020 C Sandberg <tux@tuxedocomputers.com> 2.0.3-1
+- General key event mapping support
+- Events added for backlight and touchpad
+- Fix not removing module on rpm update
 * Tue Apr 14 2020 C Sandberg <tux@tuxedocomputers.com> 2.0.2-0
 - Mark old named packages as conflicting and obsolete
 - Fix not restoring state on resume