Imported Debian patch 0.8.3-1debian/0.8.3-1

4 files changed, 31 insertions, 4 deletions

diff --git a/debian/README b/debian/README
new file mode 100644
index 0000000..de72689
--- /dev/null
+++ b/debian/README
@@ -0,0 +1,4 @@
+The Debian package for htop contains an additional feature to view output of
+ltrace(1) utility for selected process, like the same of strace(1). This
+feature is not accepted by upstream, so one shouldn't rely on its existence.
+The current hotkey ('L') is also subject to change in newer versions.
diff --git a/debian/changelog b/debian/changelog
index 621a6de..4b18977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+htop (0.8.3-1) unstable; urgency=low
+
+  * New upstream release:
+    - 0.8.2 (LP: #385862):
+      - Integrated lsof output. (Closes: #426003)
+      - Handling of absend CPU should work now. (Closes: #494057, #476273)
+      - Fixed a crash when sorting by USER column. (Closes: #526362)
+      - Fixed display of gigabyte-sized values.
+      - Fixed incremental search. (Closes: #521376)
+      - Option to display hostname in the meters area.
+    - 0.8.3
+  * debian/control:
+    - Suggested strace and ltrace. (Closes: #530449)
+    - Bumped Standards-Version to 3.8.2, no changes needed.
+  * debian/patches:
+    - 700-ltrace-support.patch: modified to not contradict with new upstream
+      release, the hotkey for ltrace output changed from 'l' to 'L'.
+  * debian/README:
+    - Added with note about ltrace support.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Mon, 29 Jun 2009 13:08:39 +0300
+
 htop (0.8.1+svn149-2) unstable; urgency=low
 
   * debian/rules:
diff --git a/debian/control b/debian/control
index dc19c05..e17dbba 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,14 @@ Section: utils
 Priority: optional
 Maintainer: Eugene V. Lyubimkin <jackyf.devel@gmail.com>
 Build-Depends: debhelper (>= 7), libncurses5-dev, autotools-dev, quilt (>= 0.40), python-minimal
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 DM-Upload-Allowed: yes
 Homepage: http://htop.sourceforge.net
 
 Package: htop
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: strace, ltrace
 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/700-ltrace-support.patch b/debian/patches/700-ltrace-support.patch
index 6f5e71d..f4fa6f5 100644
--- a/debian/patches/700-ltrace-support.patch
+++ b/debian/patches/700-ltrace-support.patch
@@ -154,7 +154,7 @@ Index: htop/htop.c
     mvaddstr(19, 0, "   F2 S: setup                           F6 >: select sort column");
     mvaddstr(20, 0, "   F1 h: show this help screen");
     mvaddstr(21, 0, "  F10 q: quit                               s: trace syscalls with strace");
-+   mvaddstr(22, 0, "                                            l: trace library calls with ltrace");
++   mvaddstr(22, 0, "                                            L: trace library calls with ltrace");
  
     attrset(CRT_colors[HELP_BOLD]);
     mvaddstr( 9, 0, " Arrows"); mvaddstr( 9,40, " F5 t");
@@ -162,7 +162,7 @@ Index: htop/htop.c
     mvaddstr(19, 0, "   F2 S"); mvaddstr(19,40, " F6 >");
     mvaddstr(20, 0, "   F1 h");
     mvaddstr(21, 0, "  F10 q"); mvaddstr(21,40, "    s");
-+   mvaddstr(22,40, "    l");
++   mvaddstr(22,40, "    L");
     attrset(CRT_colors[DEFAULT_COLOR]);
  
     attrset(CRT_colors[HELP_BOLD]);
@@ -175,7 +175,7 @@ Index: htop/htop.c
           Panel_onKey(panel, KEY_DOWN);
           break;
        }
-+      case 'l':
++      case 'L':
 +      {
 +         TraceScreen* ts = TraceScreen_new((Process*) Panel_getSelected(panel), LTRACE);
 +         TraceScreen_run(ts);