Imported Debian patch 0.8.1-1debian/0.8.1-1

8 files changed, 84 insertions, 59 deletions

diff --git a/debian/changelog b/debian/changelog
index d7aa9ea..b700561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,40 @@
+htop (0.8.1-1) experimental; urgency=low
+
+  * New maintainer. Thanks for work, Bartosz Fenski!
+  * New upstream release:
+    - Changes in 0.8.1 (Closes: #499928):
+      - Linux-VServer support.
+      - Battery meter (Closes: #484771).
+      - Fixed collection of IO stats in multithreaded processes.
+      - Removed assertion that fails on hardened kernels.
+    - Changes in 0.8.0 (Closes: #494646, #486213):
+      - Ability to change sort column with the mouse by
+        clicking column titles.
+      - Added support for Linux per-process IO statistics.
+      - Added Unicode support.
+      - Fixed display of CPU count for threaded processes.
+      - Avoid crashing when using many meters.
+    - Other fixes:
+      - Significantly increased line length limit (to 65535).
+        (Closes: #470280)
+  * debian/control:
+    - Bumped 'Standards-Version' to 3.8.0, no changes needed.
+    - Changed Build-Depends on debhelper to (>= 7) and 'libncurses5-dev' ->
+      'libncursesw5-dev'. Added dependency on quilt (>= 0.40).
+  * debian/rules:
+    - Some cleanup, used debhelper v7 commands.
+    - Pass '--enable-taskstats' and '--enable-unicode' options to configure.
+    - Pass '--enable-openvz' to configure. (Closes: #480541)
+  * debian/patches:
+    - New 010-make-desktop-file-valid.patch: makes desktop file valid.
+      Thanks to Nathan Handler <nathan.handler@gmail.com> (Closes: #488912)
+  * debian/copyright:
+    - Fixed path for GPLv2 license.
+  * debian/menu:
+    - Set proper section, removed hint (now useless).
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sun, 16 Nov 2008 20:36:18 +0200
+
 htop (0.7-1) unstable; urgency=low
 
   * New upstrem version. (Closes: #452634)
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index d511456..e40b82c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: htop
 Section: utils
 Priority: optional
-Maintainer: Bartosz Fenski <fenio@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libncurses5-dev, autotools-dev
-Standards-Version: 3.7.3
+Maintainer: Eugene V. Lyubimkin <jackyf.devel@gmail.com>
+Build-Depends: debhelper (>= 7), libncursesw5-dev, autotools-dev, quilt (>= 0.40)
+Standards-Version: 3.8.0
 Homepage: http://htop.sourceforge.net
 
 Package: htop
diff --git a/debian/copyright b/debian/copyright
index 592a24c..0fc5a2f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Upstream Author: Hisham Muhammad <lode@gobolinux.org>
 
 Copyright:
 
-Copyright 2004, 2005 Hisham Muhammad <lode@gobolinux.org>
+Copyright (C) 2004, 2005 Hisham Muhammad <lode@gobolinux.org>
 
 License:
 
@@ -17,5 +17,5 @@ Free Software Foundation; either version 2, or (at your option) any
 later version.
 
 On Debian systems, the complete text of the GNU General Public License
-can be found in the file `/usr/share/common-licenses/GPL'.
+can be found in the file `/usr/share/common-licenses/GPL-2'.
 
diff --git a/debian/menu b/debian/menu
index 4c937e9..9689b1f 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,3 +1,2 @@
-?package(htop):needs="text" section="Apps/System"\
-  title="htop" command="/usr/bin/htop"\
-  hints="Monitoring"
+?package(htop):needs="text" section="Applications/System/Monitoring"\
+  title="htop" command="/usr/bin/htop"
diff --git a/debian/patches/010-make-desktop-file-valid.patch b/debian/patches/010-make-desktop-file-valid.patch
new file mode 100644
index 0000000..c115498
--- /dev/null
+++ b/debian/patches/010-make-desktop-file-valid.patch
@@ -0,0 +1,19 @@
+Index: htop/htop.desktop
+===================================================================
+--- htop.orig/htop.desktop	2008-11-16 22:08:29.670673088 +0200
++++ htop/htop.desktop	2008-11-16 22:08:32.142641313 +0200
+@@ -1,12 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+-Version=0.7
++Version=1.0
+ Name=Htop
+ Type=Application
+ Comment=Show System Processes
+ Terminal=true
+ Exec=htop
+-Path=
+ Icon=htop
+-Categories=ConsoleOnly;System;Application;
++Categories=ConsoleOnly;System;
+ GenericName=Process Viewer
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8f8f5d7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+010-make-desktop-file-valid.patch
diff --git a/debian/rules b/debian/rules
index 946e774..ee08817 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,78 +1,47 @@
 #!/usr/bin/make -f
-# rules file for htop (May 2004)
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # 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)
 
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-config.status: configure
+config.status: configure $(QUILT_STAMPFN)
 	dh_testdir
-
 	cp /usr/share/misc/config.sub /usr/share/misc/config.guess .
-
-	CFLAGS="$(CFLAGS)" LDFLAGS="$(INSTALL_PROGRAM)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	CFLAGS="$(CFLAGS)" LDFLAGS="$(INSTALL_PROGRAM)" ./configure \
+		   --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
 
 build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	$(MAKE)
-
+build-stamp: config.status
+	dh build --before dh_auto_configure
+	dh build --after dh_auto_configure
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-
-	-$(MAKE) distclean
-
+	
+	([ -f Makefile ] && $(MAKE) distclean) || true
+	
 	dh_clean config.sub config.guess
 	dh_clean
 
 install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
+	dh install --before dh_auto_install
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/htop
+	dh install --after dh_auto_install
 
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installmenu
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+binary-indep:
+binary-arch: install
+	dh binary-arch
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install