Imported Debian patch 1.0-1debian/1.0-1

8 files changed, 49 insertions, 34 deletions

diff --git a/debian/changelog b/debian/changelog
index edf4fab..5a6dc65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+htop (1.0-1) unstable; urgency=low
+
+  * New upstream release.
+    - Don't die after a terminal resize. (Closes: #464852)
+    - Don't abort when a number of processes are removed from the list at
+      once. (Closes: #541417)
+    - Fixed the inconsistency in the documentation about "[" and "]" keys.
+      (Closes: #610329)
+  * debian/patches:
+    - 100-fix-cgroups-crash.patch: deleted, upstream fixed it in a different
+      way.
+    - 600-openvz-veid-on-kernels-gt-2.6.18.patch: ported to new upstream
+      version.
+    - 700-ltrace-support.patch: ported to new upstream version.
+    - 700-ltrace-support.patch: ltrace hotkey is 'L', not 'l'.
+  * debian/control:
+    - Add libhwloc-dev to Build-Depends on non-linux architectures.
+    - Add libncursesw5-dev to Build-Depends, enabling unicode support.
+  * debian/rules:
+    - Enable native affinity functions on linux architectures and use hwloc
+      library everywhere else.
+  * debian/copyright:
+    - Updated upstream copyright years.
+
+ -- Eugene V. Lyubimkin <jackyf@debian.org>  Sat, 26 Nov 2011 15:58:33 +0200
+
 htop (0.9-4) unstable; urgency=low
 
   * debian/rules:
diff --git a/debian/control b/debian/control
index fe77342..4e81fb2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: htop
 Section: utils
 Priority: optional
 Maintainer: Eugene V. Lyubimkin <jackyf@debian.org>
-Build-Depends: debhelper (>= 7), libncurses5-dev, autotools-dev, quilt (>= 0.40), python-minimal
+Build-Depends: debhelper (>= 7), libncurses5-dev, libncursesw5-dev,
+  autotools-dev, quilt (>= 0.40), python-minimal, libhwloc-dev [!linux-any]
 Standards-Version: 3.9.2
 Homepage: http://htop.sourceforge.net
 
diff --git a/debian/copyright b/debian/copyright
index 4866fff..ad65ae9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Upstream Author: Hisham Muhammad <lode@gobolinux.org>
 
 Copyright:
 
-Copyright (C) 2004-2010 Hisham Muhammad <lode@gobolinux.org>
+Copyright (C) 2004-2011 Hisham Muhammad <lode@gobolinux.org>
 
 License:
 
diff --git a/debian/patches/100-fix-cgroups-crash.patch b/debian/patches/100-fix-cgroups-crash.patch
deleted file mode 100644
index 4ba95cb..0000000
--- a/debian/patches/100-fix-cgroups-crash.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/ProcessList.c b/ProcessList.c
-index c234357..3bb1b81 100644
---- a/ProcessList.c
-+++ b/ProcessList.c
-@@ -473,7 +473,12 @@ static void ProcessList_readCGroupFile(Process* process, const char* dirname, co
-       char** fields = String_split(trimmed, ':');
-       free(trimmed);
- 
--      process->cgroup = strndup(fields[2] + 1, 10);
-+      if (!fields[1] || !fields[2]) {
-+         process->cgroup = strdup(""); // cgroups do not work
-+      }
-+      else {
-+         process->cgroup = strndup(fields[2] + 1, 10);
-+      }
-       String_freeArray(fields);
-    }
-    fclose(file);
diff --git a/debian/patches/600-openvz-veid-on-kernels-gt-2.6.18.patch b/debian/patches/600-openvz-veid-on-kernels-gt-2.6.18.patch
index 57e687e..c1f5247 100644
--- a/debian/patches/600-openvz-veid-on-kernels-gt-2.6.18.patch
+++ b/debian/patches/600-openvz-veid-on-kernels-gt-2.6.18.patch
@@ -13,13 +13,13 @@ Index: htop/ProcessList.c
     if (!file) 
        return;
 -   fscanf(file, 
--      "%*u %*s %*c %*u %*u %*u %*u %*u %*u %*u "
--      "%*u %*u %*u %*u %*u %*u %*u %*u "
--      "%*u %*u %*u %*u %*u %*u %*u %*u "
--      "%*u %*u %*u %*u %*u %*u %*u %*u "
--      "%*u %*u %*u %*u %*u %*u %*u %*u "
--      "%*u %*u %*u %*u %*u %*u %*u "
--      "%*u %*u %u %u",
+-      "%*32u %*32s %*1c %*32u %*32u %*32u %*32u %*32u %*32u %*32u "
+-      "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u "
+-      "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u "
+-      "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u "
+-      "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u "
+-      "%*32u %*32u %*32u %*32u %*32u %*32u %*32u "
+-      "%*32u %*32u %32u %32u",
 -      &process->vpid, &process->ctid);
 +
 +   char buffer[256];
diff --git a/debian/patches/700-ltrace-support.patch b/debian/patches/700-ltrace-support.patch
index b44b025..f126e5f 100644
--- a/debian/patches/700-ltrace-support.patch
+++ b/debian/patches/700-ltrace-support.patch
@@ -132,19 +132,19 @@ Index: htop/TraceScreen.h
  
 Index: htop/htop.1
 ===================================================================
---- htop.orig/htop.1	2011-01-16 17:02:59.000000000 +0200
-+++ htop/htop.1	2011-01-16 18:15:07.000000000 +0200
+--- htop.orig/htop.1.in	2011-01-16 17:02:59.000000000 +0200
++++ htop/htop.1.in	2011-01-16 18:15:07.000000000 +0200
 @@ -54,6 +54,11 @@
  Display open files for a process: if lsof(1) is installed, pressing this key
  will display the list of file descriptors opened by the process.
  .TP
-+.B l
++.B L
 +Trace process library calls: if ltrace(1) is installed, pressing this key
 +will attach it to the currently selected process, presenting a live
 +update of library calls issued by the process.
 +.TP
- .B F1, h
- Help screen
+ .B F1, h, ?
+ Go to the help screen
  .TP
 Index: htop/htop.c
 ===================================================================
diff --git a/debian/patches/series b/debian/patches/series
index 7204157..c8aa567 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-100-fix-cgroups-crash.patch
 600-openvz-veid-on-kernels-gt-2.6.18.patch 
 700-ltrace-support.patch 
diff --git a/debian/rules b/debian/rules
index 6c67a3b..473b41d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,13 @@ include /usr/share/quilt/quilt.make
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+	ARCH_DEPENDENT_CONFIGURE_PARAMS = --enable-native-affinity
+else
+	ARCH_DEPENDENT_CONFIGURE_PARAMS = --enable-hwloc
+endif
 
 config.status: configure $(QUILT_STAMPFN)
 	dh_testdir
@@ -27,7 +34,7 @@ config.status: configure $(QUILT_STAMPFN)
 		   --prefix=/usr --mandir=\$${prefix}/share/man \
 		   --infodir=\$${prefix}/share/info \
 		   --enable-taskstats --enable-openvz --enable-vserver \
-		   --enable-cgroup
+		   --enable-cgroup $(ARCH_DEPENDENT_CONFIGURE_PARAMS)
 
 build: build-stamp
 build-arch: build