diff options
author | Eugene V. Lyubimkin <jackyf@debian.org> | 2011-05-22 12:05:09 +0300 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:28 +0200 |
commit | b40595f7f36fdc3137cb2f767a74d13bebf25039 (patch) | |
tree | d7cb78aaf35af2063e16a0fc1d5de0856ab1b51f | |
parent | 9fb9e4e42aafa2716372f75ec5502db1a73cc2be (diff) | |
download | debian_htop-b40595f7f36fdc3137cb2f767a74d13bebf25039.tar.gz debian_htop-b40595f7f36fdc3137cb2f767a74d13bebf25039.tar.bz2 debian_htop-b40595f7f36fdc3137cb2f767a74d13bebf25039.zip |
Imported Debian patch 0.9-3debian/0.9-3
-rw-r--r-- | debian/README.source | 58 | ||||
-rw-r--r-- | debian/changelog | 12 | ||||
-rw-r--r-- | debian/control | 4 | ||||
-rwxr-xr-x | debian/rules | 3 |
4 files changed, 74 insertions, 3 deletions
diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..5dde0bf --- /dev/null +++ b/debian/README.source @@ -0,0 +1,58 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + break + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new <patch> + +where <patch> is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add <file> + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P <patch> /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). <patch> as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete <patch> + +You may need to run quilt pop -a to unapply patches first before running +this command. diff --git a/debian/changelog b/debian/changelog index 7c5f719..11792da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +htop (0.9-3) unstable; urgency=low + + * debian/rules: + - Enable cgroups support. (Closes: #627545) + * debian/README.source: + - added with standard instructions how to use quilt. + * debian/control: + - Fixed spelling as suggested by lintian. + - Bumped Standards-Version to 3.9.2, no changes needed. + + -- Eugene V. Lyubimkin <jackyf@debian.org> Sun, 22 May 2011 12:05:09 +0300 + htop (0.9-2) unstable; urgency=low * Upload to unstable. diff --git a/debian/control b/debian/control index 2338c60..fe77342 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Eugene V. Lyubimkin <jackyf@debian.org> Build-Depends: debhelper (>= 7), libncurses5-dev, autotools-dev, quilt (>= 0.40), python-minimal -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://htop.sourceforge.net Package: htop @@ -12,7 +12,7 @@ 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 + allows one to scroll the list vertically and horizontally to see all processes and their full command lines. . Tasks related to processes (killing, renicing) can be done without diff --git a/debian/rules b/debian/rules index ee00e67..94bbaf1 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,8 @@ 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-openvz --enable-vserver + --enable-taskstats --enable-openvz --enable-vserver \ + --enable-cgroup build: build-stamp build-stamp: config.status |