merge changesets 849 871 992 1126 1142 1212 1214 1215 from branches/1.2
authorgregor herrmann <gregoa@debian.org>
Fri, 20 Jun 2008 13:12:37 +0000 (13:12 -0000)
committergregor herrmann <gregoa@debian.org>
Fri, 20 Jun 2008 13:12:37 +0000 (13:12 -0000)
debian/changelog
debian/compat
debian/control
debian/copyright
debian/dirs [deleted file]
debian/rules

index 77738e3..fd34f11 100644 (file)
@@ -1,3 +1,17 @@
+cpulimit (1.1-11) unstable; urgency=low
+
+  * Clean up debian/rules.
+  * Move upstream URL from the description to the new Homepage field.
+  * Change XS-Vcs-* fields to Vcs-*.
+  * Set Standards-Version to 3.7.3 (no changes required).
+  * Create install-stamp target in debian/rules and re-arrange dependencies.
+  * Change debian/copyright to the new machine-readable format.
+  * Drop debian/dirs, create /usr/bin directly from debian/rules.
+  * Set debhelper compatibility level to 6.
+  * debian/rules: remove configure and configure-stamp targets.
+
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Thu, 13 Mar 2008 23:57:20 +0100
+
 cpulimit (1.1-10) unstable; urgency=low
 
   * Add patch to fix 'cpulimit drops priority, then can't get back up. Fix
index 7ed6ff8..1e8b314 100644 (file)
@@ -1 +1 @@
-5
+6
index 37ccefe..4a3818e 100644 (file)
@@ -3,10 +3,11 @@ Section: admin
 Priority: optional
 Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 5.0.0), dpatch
-Standards-Version: 3.7.2
-XS-Vcs-Svn: http://svn.toastfreeware.priv.at/debian/cpulimit/trunk/
-XS-Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/cpulimit/trunk/
+Build-Depends: debhelper (>= 6), dpatch
+Standards-Version: 3.7.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/
 
 Package: cpulimit
 Architecture: any
@@ -18,5 +19,3 @@ Description: limits the cpu usage of a process
  not act on the nice value or other priority stuff, but on the real cpu
  usage.  Besides it is able to adapt itself to the overall system load,
  dynamically and quickly.
- .
-  Homepage: http://cpulimit.sourceforge.net/
index 208e9c7..13bbbfe 100644 (file)
@@ -1,14 +1,9 @@
-This package was debianized by gregor herrmann <gregor+debian@comodo.priv.at> on
-Mon,  3 Apr 2006 21:51:36 +0200.
-
-It was originally downloaded from http://marlon80.interfree.it/cpulimit/download.html
-The new download location is https://sourceforge.net/project/showfiles.php?group_id=174425
-
-Copyright:
-(c) 2005 Angelo Marletta <marlonx80@hotmail.com>
-
-License:
+Upstream download location:
+ https://sourceforge.net/project/showfiles.php?group_id=174425
 
+Files: *
+Copyright: © 2005 Angelo Marletta <marlonx80@hotmail.com>
+License: LGPL2+
  This file may be used subject to the terms and conditions of the
  GNU Library General Public License Version 2, or any later version
  at your option, as published by the Free Software Foundation.
@@ -17,6 +12,5 @@ License:
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU Library General Public License for more details.
 
- On Debian GNU/Linux systems, the complete text of the GNU Library/Lesser
- Public License can be found in `/usr/share/common-licenses/LGPL'.
-                         
+On Debian GNU/Linux systems, the complete text of the GNU Library/Lesser
+Public License can be found in `/usr/share/common-licenses/LGPL-2'.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index e772481..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
index bf418ed..4f7e2b9 100755 (executable)
@@ -19,33 +19,27 @@ else
        CFLAGS += -O2
 endif
 
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       touch configure-stamp
-
-
 build: build-stamp
-
-build-stamp: configure-stamp patch
+build-stamp: $(DPATCH_STAMPFN)
        dh_testdir
        $(MAKE)
-       touch build-stamp
+       touch $@
 
 clean: unpatch
        dh_testdir
        dh_testroot
-       rm -f build-stamp configure-stamp patch-stamp
+       rm -f build-stamp configure-stamp install-stamp
        [ ! -f Makefile ] || $(MAKE) clean
        dh_clean 
 
-install: build
+install: install-stamp
+install-stamp: build-stamp
        dh_testdir
        dh_testroot
        dh_clean -k 
-       dh_installdirs
+       dh_installdirs usr/bin
        install cpulimit $(CURDIR)/debian/cpulimit/usr/bin
-
+       touch $@
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -57,25 +51,10 @@ binary-arch: build install
        dh_testroot
        dh_installchangelogs 
        dh_installdocs
-       dh_installexamples
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
        dh_installman debian/cpulimit.1
-       dh_link
        dh_strip
        dh_compress
        dh_fixperms
-#      dh_perl
-#      dh_python
-#      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol
@@ -83,4 +62,4 @@ binary-arch: build install
        dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install