[Pkg-wmaker-commits] [wmbattery] 108/241: Use debhelper v7; rules file minimisation.

[Doug Torrance]

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

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

commit de403dfc7d0d44adf1a22cb4797ee1c0f359b78c
Author: Joey Hess <joey at kodama.kitenet.net>
Date:   Thu Apr 24 02:01:34 2008 -0400

    Use debhelper v7; rules file minimisation.
---
 Makefile         | 12 ++++--------
 debian/changelog |  6 ++++++
 debian/compat    |  2 +-
 debian/control   |  2 +-
 debian/rules     | 54 ++++--------------------------------------------------
 5 files changed, 16 insertions(+), 60 deletions(-)

diff --git a/Makefile b/Makefile
index edf87cc..70d39fe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,3 @@
-# Note: this is just a stub Makefile, to make it easy for you to
-# run configure and build pdmenu. The full-fledged Makefile is created
-# by ./configure, and is called `makeinfo'. You might want to edit it.
-
 include makeinfo
 
 all: wmbattery
@@ -13,10 +9,10 @@ distclean: clean
 	rm -f config.status config.cache config.log makeinfo config.h configure
 
 install: all
-	$(INSTALL) -d $(bindir) $(man1dir) $(icondir)
-	$(INSTALL_PROGRAM) wmbattery $(bindir)
-	$(INSTALL_DATA) $(srcdir)/wmbattery.1x $(man1dir)/wmbattery.1x
-	$(INSTALL_DATA) $(srcdir)/*.xpm $(icondir)
+	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(icondir)
+	$(INSTALL_PROGRAM) wmbattery $(DESTDIR)$(bindir)
+	$(INSTALL_DATA) $(srcdir)/wmbattery.1x $(DESTDIR)$(man1dir)/wmbattery.1x
+	$(INSTALL_DATA) $(srcdir)/*.xpm $(DESTDIR)$(icondir)
 
 uninstall:
 	rm -rf $(bindir)/wmbattery $(man1dir)/wmbattery.1x $(icondir)
diff --git a/debian/changelog b/debian/changelog
index 5c22b4b..738f3ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wmbattery (2.39) UNRELEASED; urgency=low
+
+  * Use debhelper v7; rules file minimisation.
+
+ -- Joey Hess <joeyh at debian.org>  Thu, 24 Apr 2008 01:49:34 -0400
+
 wmbattery (2.38) unstable; urgency=low
 
   * Magic header file reordering to work around the disgusting
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index a481744..94c5def 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: wmbattery
 Section: x11
 Priority: extra
-Build-Depends: debhelper (>= 5), libxext-dev, libxpm-dev, autoconf, libapm-dev, dpkg-dev (>= 1.9.0), libxt-dev, libhal-dev
+Build-Depends: debhelper (>= 7), libxext-dev, libxpm-dev, autoconf, libapm-dev, dpkg-dev (>= 1.9.0), libxt-dev, libhal-dev
 Maintainer: Joey Hess <joeyh at debian.org>
 Standards-Version: 3.7.3
 Vcs-Git: git://git.kitenet.net/wmbattery
diff --git a/debian/rules b/debian/rules
index 94bf8f8..b99b77e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,57 +1,11 @@
 #!/usr/bin/make -f
+%:
+	dh $@
 
-INSTALL_PROGRAM=install
-CFLAGS=-O2 -Wall -g
-
-build: build-stamp
-build-stamp:
-	dh_testdir
+build:
 	autoconf
-	./configure --mandir=$(shell pwd)/debian/wmbattery/usr/share/man \
-		--prefix=/usr CFLAGS="$(CFLAGS)"
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	$(MAKE) distclean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) prefix=debian/wmbattery/usr \
-		INSTALL_PROGRAM="$(INSTALL_PROGRAM)" install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs TODO README
-	dh_installexamples
-	dh_installmenu
-	dh_installchangelogs
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh build
 
 # Not intended for use by anyone except the author.
 announcedir:
 	@echo ${HOME}/src/joeywiki/code/wmbattery/news
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

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