From 284e3ab4f988cf3e2195a6f01bf376410de2266f Mon Sep 17 00:00:00 2001
From: andreasb242 <andreasb242@users.noreply.github.com>
Date: Mon, 20 Jan 2020 19:26:58 +0100
Subject: [PATCH] Merge pull request #1714 from barak/master

Tiny changes demanded by lintian during Debian packaging
---
 desktop/com.github.xournalpp.xournalpp.appdata.xml | 2 +-
 desktop/com.github.xournalpp.xournalpp.desktop     | 1 +
 desktop/x-xojpp.desktop                            | 1 -
 desktop/x-xopp.desktop                             | 1 -
 desktop/x-xopt.desktop                             | 1 -
 5 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/desktop/com.github.xournalpp.xournalpp.appdata.xml b/desktop/com.github.xournalpp.xournalpp.appdata.xml
index 392e86332705..87ba7744217a 100644
--- a/desktop/com.github.xournalpp.xournalpp.appdata.xml
+++ b/desktop/com.github.xournalpp.xournalpp.appdata.xml
@@ -77,7 +77,7 @@
   <content_rating type="oars-1.0"/>
   <releases>
     <!-- Could be automated more:
-	 `git tag --list | grep "^[0-9]*\.[0-9]*\.[0-9]*$`"
+	 `git tag -l | grep "^[0-9]*\.[0-9]*\.[0-9]*$`"
     -->
     <release date="2019-11-10" version="1.0.16"/>
     <release date="2019-10-15" version="1.0.15"/>
diff --git a/desktop/com.github.xournalpp.xournalpp.desktop b/desktop/com.github.xournalpp.xournalpp.desktop
index afd4af82b36a..a24b9483ad04 100644
--- a/desktop/com.github.xournalpp.xournalpp.desktop
+++ b/desktop/com.github.xournalpp.xournalpp.desktop
@@ -3,6 +3,7 @@ Type=Application
 
 Name=Xournal++
 Comment=Take handwritten notes
+Keywords=Tablet;Wacom;Pen Input;PDF Annotation;Markup
 Name[fr]=Xournal++
 Comment[fr]=Prise de notes manuscrites
 Name[ca]=Xournal++
diff --git a/desktop/x-xojpp.desktop b/desktop/x-xojpp.desktop
index 538b3408eedc..26267c38fac3 100644
--- a/desktop/x-xojpp.desktop
+++ b/desktop/x-xojpp.desktop
@@ -1,5 +1,4 @@
  [Desktop Entry]
- Encoding=UTF-8
  Type=MimeType
  MimeType=application/x-xojpp
  Icon=xopp
diff --git a/desktop/x-xopp.desktop b/desktop/x-xopp.desktop
index c3299691d82a..8ffde9f8fdfe 100644
--- a/desktop/x-xopp.desktop
+++ b/desktop/x-xopp.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=MimeType
 MimeType=application/x-xopp
 Icon=xopp
diff --git a/desktop/x-xopt.desktop b/desktop/x-xopt.desktop
index 9d5c9c0815d4..c6c4c8947c78 100644
--- a/desktop/x-xopt.desktop
+++ b/desktop/x-xopt.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=MimeType
 MimeType=application/x-xopt
 Icon=xopt