From d68f86f0a3bd86e55714d9b3004481fce0648d8d Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Wed, 13 Apr 2016 16:15:57 +0200 Subject: Update compat -> 9, rules -> debhelper/9, Maintainership change jackyf and ginggs will co-maintain (uploaders) jackyf, thank you so much for many years of maintaining htop! --- debian/compat | 2 +- debian/control | 13 +++++----- debian/rules | 79 +++++----------------------------------------------------- 3 files changed, 14 insertions(+), 80 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 1ad4697..d10eff0 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,18 @@ Source: htop Section: utils Priority: optional -Maintainer: Eugene V. Lyubimkin -Build-Depends: debhelper (>= 7), libncurses5-dev, libncursesw5-dev, - autotools-dev, quilt (>= 0.40), python-minimal, libhwloc-dev [!linux-any], - dpkg-dev (>= 1.16.1) -Standards-Version: 3.9.5 +Maintainer: Daniel Lange +Uploaders: Eugene V. Lyubimkin , + Graham Inggs +Build-Depends: debhelper (>= 9), libncurses5-dev, libncursesw5-dev, + dh-autoreconf +Standards-Version: 3.9.7 Homepage: http://hisham.hm/htop/ Package: htop Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: strace, ltrace +Suggests: strace, lsof Description: interactive processes viewer Htop is an ncursed-based process viewer similar to top, but it allows one to scroll the list vertically and horizontally to see diff --git a/debian/rules b/debian/rules index 6970916..430c8fb 100755 --- a/debian/rules +++ b/debian/rules @@ -1,75 +1,8 @@ #!/usr/bin/make -f +%: + dh $@ --with autoreconf -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) -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 - -CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) - -config.status: configure $(QUILT_STAMPFN) - dh_testdir - - [ -r config.sub.orig ] || \ - cp -f config.sub config.sub.orig - [ -r config.guess.orig ] || \ - cp -f config.guess config.guess.orig - - [ ! -r /usr/share/misc/config.sub ] || \ - cp -f /usr/share/misc/config.sub config.sub - [ ! -r /usr/share/misc/config.guess ] || \ - cp -f /usr/share/misc/config.guess config.guess - - CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(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-openvz --enable-vserver \ - --enable-cgroup $(ARCH_DEPENDENT_CONFIGURE_PARAMS) - -build: build-stamp -build-arch: build -build-indep: build -build-stamp: config.status - scripts/MakeHeader.py Process.c - scripts/MakeHeader.py TraceScreen.c - dh build --before dh_auto_configure - dh build --after dh_auto_configure - touch build-stamp - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp - - ([ -f Makefile ] && $(MAKE) distclean) || true - [ ! -r config.guess.orig ] || \ - mv -f config.guess.orig config.guess || : - [ ! -r config.sub.orig ] || \ - mv -f config.sub.orig config.sub || : - - dh_clean - -install: build - dh install --before dh_auto_install - $(MAKE) install DESTDIR=$(CURDIR)/debian/htop - find $(CURDIR)/debian/htop -type d -empty -delete - dh install --after dh_auto_install - -binary-indep: -binary-arch: install - dh binary-arch - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_auto_configure: + dh_auto_configure -- --enable-linux-affinity --enable-taskstats \ + --enable-openvz --enable-vserver --enable-cgroup \ + --enable-unicode -- cgit v1.2.3