* Switch to debhelper 7.

* Set Standards-Version to 3.8.3 (no changes).
* debian/control: make short description a noun phrase.

diff --git a/debian/changelog b/debian/changelog
index 978dace499e11836c149bfa1b1124d849237d989..9c1b9a0109dcbe38be3e3da838ea89f07a8ea7d1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ cpulimit (1.1-12) UNRELEASED; urgency=low
   * debian/watch: back to the redirector at qa.debian.org.
   * Capitalize 'CPU' in short and long description, thanks to Filipus Klutiero
     for the bug report (closes: #542868).
+  * Switch to debhelper 7.
+  * Set Standards-Version to 3.8.3 (no changes).
+  * debian/control: make short description a noun phrase.
 
  -- gregor herrmann <gregoa@debian.org>  Fri, 20 Jun 2008 21:37:59 +0200
 

diff --git a/debian/control b/debian/control
index 7f8d05c5d9436e4e7cf1c5d706dd6acc0efee2e1..0eb3fdd0555836d13d77add6222fa94d4ddf2d36 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: admin
 Priority: optional
 Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 6), quilt (>= 0.40)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7)
+Standards-Version: 3.8.3
 Homepage: http://cpulimit.sourceforge.net/
 Vcs-Svn: http://svn.toastfreeware.priv.at/debian/cpulimit/trunk/
 Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/cpulimit/trunk/
@@ -12,7 +12,7 @@ Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/cpulimit/
 Package: cpulimit
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: limits the CPU usage of a process
+Description: tool for limiting the CPU usage of a process
  cpulimit is a simple program that attempts to limit the CPU usage of a
  process (expressed in percentage, not in CPU time). This is useful to
  control batch jobs, when you don't want them to eat too much CPU. It does

diff --git a/debian/cpulimit.install b/debian/cpulimit.install
new file mode 100644 (file)
index 0000000..acc4f26
--- /dev/null
+++ b/debian/cpulimit.install
@@ -0,0 +1 @@
+cpulimit usr/bin

diff --git a/debian/cpulimit.manpages b/debian/cpulimit.manpages
new file mode 100644 (file)
index 0000000..4f10d92
--- /dev/null
+++ b/debian/cpulimit.manpages
@@ -0,0 +1 @@
+debian/cpulimit.1

diff --git a/debian/rules b/debian/rules
index 7d6a9d7a86603f51908bd90738b7193df0f322ed..749e624c3ac5e51e8c65f65c2fe4d2dd60fc93e0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,64 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/quilt/quilt.make
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
-       dh_testdir
-       CFLAGS="$(CFLAGS)" $(MAKE)
-       touch $@
-
-clean: unpatch
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp install-stamp
-       [ ! -f Makefile ] || $(MAKE) clean
-       dh_clean
-
-install: install-stamp
-install-stamp: build-stamp
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_install cpulimit usr/bin
-       touch $@
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installman debian/cpulimit.1
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+       dh --with quilt $@