From d4742a8f78f005c78d7af1d10a302baec1558ca2 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 25 Jul 2016 18:47:54 +0200 Subject: Import upstream 2.0.2, remove Debian patches upstreamed, update d/changelog --- debian/changelog | 14 ++--- .../patches/001-lintian-warning-fix-man-typo.patch | 15 ------ .../002-lintian-warning-fix-desktop-keywords.patch | 12 ----- debian/patches/003-use-source-date-epoch.patch | 15 ------ debian/patches/004-linux-backend-for-hurd.patch | 61 ---------------------- debian/patches/series | 4 -- 6 files changed, 7 insertions(+), 114 deletions(-) delete mode 100644 debian/patches/001-lintian-warning-fix-man-typo.patch delete mode 100644 debian/patches/002-lintian-warning-fix-desktop-keywords.patch delete mode 100644 debian/patches/003-use-source-date-epoch.patch delete mode 100644 debian/patches/004-linux-backend-for-hurd.patch diff --git a/debian/changelog b/debian/changelog index 3cf2b0d..e2f5bb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ -htop (2.0.1-2) UNRELEASED; urgency=medium +htop (2.0.2-1) UNRELEASED; urgency=medium - [ Graham Inggs ] - * Use SOURCE_DATE_EPOCH instead of current year in copyright message. - - [ Daniel Lange ] - * Fix build to detect the Hurd as a Linux platform. (Closes: #821747) + * Update to upstream version 2.0.2 + - Use SOURCE_DATE_EPOCH instead of current year in copyright message + to make build reproducible. (Closes: #822963) + - Fix build to detect the Hurd as a Linux platform. (Closes: #821747) + - Fix crash when setting CPU affinity and -fPIE. (LP: #1589549) * Bump Standards to 3.9.8 (no changes required) - -- Graham Inggs Fri, 15 Apr 2016 18:16:59 +0200 + -- Daniel Lange Mon, 25 Jul 2016 18:39:58 +0200 htop (2.0.1-1) unstable; urgency=medium diff --git a/debian/patches/001-lintian-warning-fix-man-typo.patch b/debian/patches/001-lintian-warning-fix-man-typo.patch deleted file mode 100644 index 889b7ae..0000000 --- a/debian/patches/001-lintian-warning-fix-man-typo.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Fix a lintian warning about a typo in the man page - spelling-error-in-manpage usr/share/man/man1/htop.1.gz -Author: Daniel Lange ---- ---- a/htop.1.in -+++ b/htop.1.in -@@ -10,7 +10,7 @@ Htop is a free (GPL) ncurses-based proce - .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 diff --git a/debian/patches/002-lintian-warning-fix-desktop-keywords.patch b/debian/patches/002-lintian-warning-fix-desktop-keywords.patch deleted file mode 100644 index a7bd134..0000000 --- a/debian/patches/002-lintian-warning-fix-desktop-keywords.patch +++ /dev/null @@ -1,12 +0,0 @@ -Description: Add Keywords entry to .desktop file - lintian warning desktop-entry-lacks-keywords-entry - usr/share/applications/htop.desktop -Author: Daniel Lange ---- ---- 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 diff --git a/debian/patches/003-use-source-date-epoch.patch b/debian/patches/003-use-source-date-epoch.patch deleted file mode 100644 index ce64b32..0000000 --- a/debian/patches/003-use-source-date-epoch.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Use SOURCE_DATE_EPOCH instead of current year in copyright message - This should make the build reproducible -Author: Graham Inggs -Last-Update: 2016-04-15 ---- a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,7 @@ - AC_PREREQ(2.65) - AC_INIT([htop],[2.0.1],[hisham@gobolinux.org]) - --year=$(date +%Y) -+year=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y) - - # The following two lines are required by hwloc scripts - AC_USE_SYSTEM_EXTENSIONS diff --git a/debian/patches/004-linux-backend-for-hurd.patch b/debian/patches/004-linux-backend-for-hurd.patch deleted file mode 100644 index 059e042..0000000 --- a/debian/patches/004-linux-backend-for-hurd.patch +++ /dev/null @@ -1,61 +0,0 @@ -Make the build system use $target_os and consider Hurd to be Linux - reg. htop_platform -Source: https://patch-diff.githubusercontent.com/raw/hishamhm/htop/pull/472.patch -From: James Clarke -Date: Mon, 18 Apr 2016 23:55:55 +0100 -Subject: [PATCH 1/2] 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 fa32359..8d48d68 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 -Date: Mon, 18 Apr 2016 23:57:30 +0100 -Subject: [PATCH 2/2] 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 8d48d68..ccbfb52 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*) diff --git a/debian/patches/series b/debian/patches/series index 6019310..a437421 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1 @@ -001-lintian-warning-fix-man-typo.patch -002-lintian-warning-fix-desktop-keywords.patch -003-use-source-date-epoch.patch -004-linux-backend-for-hurd.patch 601-openvz-new-ctid-vpid.patch -- cgit v1.2.3