From a16cd75873cfc544e0f1bcf61b593080729b29f9 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 6 Dec 2008 11:03:18 +0200 Subject: Imported Debian patch 0.8.1-2 --- debian/changelog | 15 +++++++++++++++ debian/control | 4 ++-- debian/patches/010-make-desktop-file-valid.patch | 1 + debian/patches/200-filter-non-printable-characters.patch | 14 ++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 6 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 debian/patches/200-filter-non-printable-characters.patch diff --git a/debian/changelog b/debian/changelog index b700561..58c3968 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +htop (0.8.1-2) experimental; urgency=low + + * Disabled unicode support, it has both build and work problems yet. + (Closes: #507423) + * debian/patches: + - New patch 200-filter-non-printable-characters.patch to filter + non-printable characters in process names. Thanks to Josh Triplett + and Andrew O. Shadoura. (Closes: #504144) + - 010-make-desktop-file-valid.patch: comment added. + * debian/control: + - Added '${misc:Depends}' to 'Depends', fixes lintian warning. + - Added 'python-minimal' to 'Build-Depends' for MakeHeader.py. + + -- Eugene V. Lyubimkin Sat, 06 Dec 2008 11:03:18 +0200 + htop (0.8.1-1) experimental; urgency=low * New maintainer. Thanks for work, Bartosz Fenski! diff --git a/debian/control b/debian/control index e40b82c..9f08d89 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: htop Section: utils Priority: optional Maintainer: Eugene V. Lyubimkin -Build-Depends: debhelper (>= 7), libncursesw5-dev, autotools-dev, quilt (>= 0.40) +Build-Depends: debhelper (>= 7), libncurses5-dev, autotools-dev, quilt (>= 0.40), python-minimal Standards-Version: 3.8.0 Homepage: http://htop.sourceforge.net Package: htop Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: interactive processes viewer Htop is an ncursed-based process viewer similar to top, but it allows to scroll the list vertically and horizontally to see diff --git a/debian/patches/010-make-desktop-file-valid.patch b/debian/patches/010-make-desktop-file-valid.patch index c115498..24721c8 100644 --- a/debian/patches/010-make-desktop-file-valid.patch +++ b/debian/patches/010-make-desktop-file-valid.patch @@ -1,3 +1,4 @@ +Make desktop file valid. See #488912 in Debian BTS. Index: htop/htop.desktop =================================================================== --- htop.orig/htop.desktop 2008-11-16 22:08:29.670673088 +0200 diff --git a/debian/patches/200-filter-non-printable-characters.patch b/debian/patches/200-filter-non-printable-characters.patch new file mode 100644 index 0000000..3a3867e --- /dev/null +++ b/debian/patches/200-filter-non-printable-characters.patch @@ -0,0 +1,14 @@ +Filters non-printable characters from process names. See #504144 in Debian BTS. +Index: htop/RichString.c +=================================================================== +--- htop.orig/RichString.c 2008-12-06 11:13:19.679940957 +0200 ++++ htop/RichString.c 2008-12-06 11:14:57.454712750 +0200 +@@ -89,7 +89,7 @@ + inline void RichString_appendn(RichString* this, int attrs, char* data_c, int len) { + int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len); + for (int i = this->len, j = 0; i < last; i++, j++) +- this->chstr[i] = data_c[j] | attrs; ++ this->chstr[i] = (isprint(data_c[j]) ? data_c[j] : '?') | attrs; + this->chstr[last] = 0; + this->len = last; + } diff --git a/debian/patches/series b/debian/patches/series index 8f8f5d7..3f8b005 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 010-make-desktop-file-valid.patch +200-filter-non-printable-characters.patch diff --git a/debian/rules b/debian/rules index ee08817..afbb51e 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ config.status: configure $(QUILT_STAMPFN) --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ - --enable-taskstats --enable-unicode --enable-openvz + --enable-taskstats --enable-openvz build: build-stamp build-stamp: config.status -- cgit v1.2.3