From a9508275ccdb875b57c6e7f6af746abb266663f8 Mon Sep 17 00:00:00 2001
From: James Clarke <jrtc27@jrtc27.com>
Date: Mon, 18 Apr 2016 23:55:55 +0100
Subject: [PATCH 1/4] Use $target_os instead of $target in configure.ac

---
 configure.ac | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index fa323598..8d48d680 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,17 +26,17 @@ AC_PROG_LIBTOOL
 
 # Checks for platform.
 # ----------------------------------------------------------------------
-case "$target" in
-*linux*)
+case "$target_os" in
+linux*)
    my_htop_platform=linux
    ;;
-*freebsd*)
+freebsd*|kfreebsd*)
    my_htop_platform=freebsd
    ;;
-*openbsd*)
+openbsd*)
    my_htop_platform=openbsd
    ;;
-*darwin*)
+darwin*)
    my_htop_platform=darwin
    ;;
 *)

From 2de52862a693327e9d18057b175e4a7753a492e3 Mon Sep 17 00:00:00 2001
From: James Clarke <jrtc27@jrtc27.com>
Date: Mon, 18 Apr 2016 23:57:30 +0100
Subject: [PATCH 2/4] Use Linux backend on the Hurd

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 8d48d680..ccbfb52c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_PROG_LIBTOOL
 # Checks for platform.
 # ----------------------------------------------------------------------
 case "$target_os" in
-linux*)
+linux*|gnu*)
    my_htop_platform=linux
    ;;
 freebsd*|kfreebsd*)

From 4d3f483b96afd17577cb5332dd5ecb22f49bd03b Mon Sep 17 00:00:00 2001
From: Daniel Lange <DLange@git.local>
Date: Tue, 19 Apr 2016 18:32:39 +0200
Subject: [PATCH 3/4] Fix a typo in the man page (Debian Lintian
 spelling-error-in-manpage)

Debian patch from
https://anonscm.debian.org/cgit/collab-maint/htop.git/tree/debian/patches/001-lintian-warning-fix-man-typo.patch
---
 htop.1.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htop.1.in b/htop.1.in
index 1fa88ef9..93a5310f 100644
--- a/htop.1.in
+++ b/htop.1.in
@@ -10,7 +10,7 @@ Htop is a free (GPL) ncurses-based process viewer for Linux.
 .LP
 It is similar to top, but allows you to scroll vertically and horizontally,
 so you can see all the processes running on the system, along with their full
-command lines, as well as viewing them as a process tree, selecting mutiple
+command lines, as well as viewing them as a process tree, selecting multiple
 processes and acting on them all at once.
 .LP
 Tasks related to processes (killing, renicing) can be done without

From 74f8b3104047db662dc3ce8ca4418051f63609ad Mon Sep 17 00:00:00 2001
From: Daniel Lange <DLange@git.local>
Date: Tue, 19 Apr 2016 18:36:29 +0200
Subject: [PATCH 4/4] Add Keywords entry to .desktop file (Debian Lintian
 warning desktop-entry-lacks-keywords-entry)

Debian patch from
https://anonscm.debian.org/cgit/collab-maint/htop.git/tree/debian/patches/002-lintian-warning-fix-desktop-keywords.patch
---
 htop.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htop.desktop b/htop.desktop
index 2f7a7ee6..b88d530a 100644
--- a/htop.desktop
+++ b/htop.desktop
@@ -60,3 +60,4 @@ GenericName[sv]=Processvisning
 GenericName[tr]=Süreç Görüntüleyici
 GenericName[uk]=Перегляд процесів
 GenericName[zh_TW]=行程檢視器
+Keywords=system;process;task