[Pkg-wmaker-commits] [wmload] 04/58: Imported Debian patch 0.9.2-9

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmload.

commit 1feaaaa6267882ccec960ced28086e8328781c10
Author: Marcelo E. Magallon <mmagallo at debian.org>
Date:   Thu Dec 13 00:19:33 2001 +0100

    Imported Debian patch 0.9.2-9
---
 debian/changelog | 24 ++++++++++++++++++++++++
 debian/control   | 10 +++++-----
 debian/menu      |  2 +-
 debian/rules     |  2 +-
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3aac9b2..827aa90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+wmload (0.9.2-9) unstable; urgency=low
+
+  * debian/control: Sigh.  Forgot about xmkmf in xutils.  (closes: bug#123655)
+
+ -- Marcelo E. Magallon <mmagallo at debian.org>  Thu, 13 Dec 2001 00:19:33 +0100
+
+wmload (0.9.2-8) unstable; urgency=low
+
+  * debian/control: Build-Depend on debhelper.  See entry for 0.9.2-5, duh.
+    (closes: bug#123199)
+
+ -- Marcelo E. Magallon <mmagallo at debian.org>  Mon, 10 Dec 2001 09:43:22 +0100
+
+wmload (0.9.2-7) unstable; urgency=low
+
+  * debian/rules: install to /usr, not /usr/X11R6 (closes: bug#122021)
+  * debian/control: Build-Depends xlibs-dev.  Ah! Someone talked sense into
+    Branden...
+  * Suggest wmavgload?  I didn't know Joy was into crack.
+  * debian/control: Proper grammar and unconvoluted style is undervalued
+    nowadays.
+
+ -- Marcelo E. Magallon <mmagallo at debian.org>  Sun,  9 Dec 2001 12:40:10 +0100
+
 wmload (0.9.2-6) unstable; urgency=low
 
   * NMU... no, MU... uh, no, NMU... :) Returning maintainership to
diff --git a/debian/control b/debian/control
index 203e113..509904f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,18 @@ Source: wmload
 Section: x11
 Priority: optional
 Maintainer: Marcelo Magallon <mmagallo at debian.org>
-Build-Depends: libxpm4-dev
-Standards-Version: 3.1.1
+Build-Depends: xlibs-dev, debhelper (>= 3), xutils
+Standards-Version: 3.5.6
 
 Package: wmload
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: wmaker, wmavgload
+Suggests: wmaker
 Description: system load monitor designed for Window Maker
  wmload displays a graphical representation of the kernel/system
  statistics on a 64x64 miniwindow. There are three shades in the
  window: the light one, which corresponds to user statistics, second
  is the nice time statistics, and the darkest one is system statistics.
  .
- It works with other window managers, since there isn't actually anything
- in the program to make it require Window Maker, except maybe the look.
+ It works with other window managers, there isn't anything in the program to
+ make it require Window Maker, except maybe the look.
diff --git a/debian/menu b/debian/menu
index 4e9858a..5ebafcb 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
 ?package(wmload): needs=X11 section="Apps/System" title="wmload" \
- command="/usr/bin/X11/wmload -shape -withdrawn"
+ command="/usr/bin/wmload -shape -withdrawn"
diff --git a/debian/rules b/debian/rules
index 376b75b..2315b41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ binary-arch: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) install install.man DESTDIR=`pwd`/debian/tmp
+	$(MAKE) install install.man DESTDIR=`pwd`/debian/tmp BINDIR=/usr/bin MANPATH=/usr/share/man
 	dh_installdocs README
 	dh_installchangelogs
 	dh_installmenu

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmload.git