[Pkg-wmaker-commits] [wmbattery] 38/241: * Moved makefile stuff out of makeinfo, so it is just definitions. * Support DEB_BUILD_OPTIONS. * debhelper v4.

[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 475f45dff5342fc5d648c6bf8b9b605b2ef286fe
Author: joey <joey at a4a2c43b-8ac3-0310-8836-e0e880c912e2>
Date:   Sat Jun 1 23:52:03 2002 +0000

       * Moved makefile stuff out of makeinfo, so it is just definitions.
       * Support DEB_BUILD_OPTIONS.
       * debhelper v4.
---
 Makefile             | 22 ++++++++++++++++++
 autoconf/makeinfo.in | 66 +++++++++++++++++-----------------------------------
 debian/changelog     |  8 +++++++
 debian/compat        |  1 +
 debian/control       |  4 ++--
 debian/rules         |  6 -----
 6 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/Makefile b/Makefile
index e595368..d80e36a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,28 @@
 
 include makeinfo
 
+all: wmbattery
+
+clean:
+	rm -f wmbattery *.o
+
+distclean: clean
+	rm -f config.status config.cache config.log makeinfo config.h
+
+install: all
+	$(INSTALL) -d $(bindir) $(man1dir) $(icondir)
+	$(INSTALL_PROGRAM) wmbattery $(bindir)
+	$(INSTALL_DATA) $(srcdir)/wmbattery.1x $(man1dir)/wmbattery.1x
+	$(INSTALL_DATA) $(srcdir)/*.xpm $(icondir)
+
+uninstall:
+	rm -rf $(bindir)/wmbattery $(man1dir)/wmbattery.1x $(icondir)
+
+wmbattery: wmbattery.o acpi.o sonypi.o
+	$(CC) $(LDFLAGS) wmbattery.o acpi.o sonypi.o -o wmbattery $(LIBS)
+
+wmbattery.o: wmbattery.c wmbattery.h
+
 configure: configure.in
 	autoconf
 
diff --git a/autoconf/makeinfo.in b/autoconf/makeinfo.in
index 99babe0..32bfecb 100644
--- a/autoconf/makeinfo.in
+++ b/autoconf/makeinfo.in
@@ -1,45 +1,21 @@
-bindir=@bindir@
-exec_prefix=@exec_prefix@
-icondir=@datadir@/icons/wmbattery
-man1dir=@mandir@/man1
-prefix=@prefix@
-srcdir=@srcdir@
-
-CC=@CC@
-CFLAGS=@CFLAGS@ -Wall -DACPI_APM
-CPPFLAGS=@CPPFLAGS@ -DICONDIR=\"$(icondir)\"
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@
-VPATH=@srcdir@
-
-all: wmbattery
-
-clean:
-	rm -f wmbattery *.o
-
-distclean: clean
-	rm -f config.status config.cache config.log makeinfo config.h
-
-dist: distclean
-	@if [ -d $(srcdir)/CVS ]; then \
-		echo "Run from exported sources to avoid distributing CVS files"; \
-	else \
-		cd $(srcdir) && autoconf && (cd .. && tar czvf wmbattery.tar.gz wmbattery); \
-	fi
-
-install: all
-	$(INSTALL) -d $(bindir) $(man1dir) $(icondir)
-	$(INSTALL_PROGRAM) wmbattery $(bindir)
-	$(INSTALL_DATA) $(srcdir)/wmbattery.1x $(man1dir)/wmbattery.1x
-	$(INSTALL_DATA) $(srcdir)/*.xpm $(icondir)
-
-uninstall:
-	rm -rf $(bindir)/wmbattery $(man1dir)/wmbattery.1x $(icondir)
-
-wmbattery: wmbattery.o acpi.o sonypi.o
-	$(CC) $(LDFLAGS) wmbattery.o acpi.o sonypi.o -o wmbattery $(LIBS)
-
-wmbattery.o: wmbattery.c wmbattery.h
+# Info for make, this will be preprocessed by autoconf.
+bindir		= @bindir@
+exec_prefix 	= @exec_prefix@
+icondir		= @datadir@/icons/wmbattery
+man1dir		= @mandir@/man1
+prefix		= @prefix@
+srcdir		= @srcdir@
+
+CC		= @CC@
+CFLAGS		= @CFLAGS@ -Wall -DACPI_APM
+CPPFLAGS	= @CPPFLAGS@ -DICONDIR=\"$(icondir)\"
+INSTALL		= @INSTALL@
+INSTALL_DATA	= @INSTALL_DATA@
+INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+LDFLAGS		= @LDFLAGS@
+LIBS		= @LIBS@
+
+# DEB_BUILD_OPTIONS suport, to control binary stripping.
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
diff --git a/debian/changelog b/debian/changelog
index 2c77e55..15dceca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wmbattery (2.09) unstable; urgency=low
+
+  * Moved makefile stuff out of makeinfo, so it is just definitions.
+  * Support DEB_BUILD_OPTIONS.
+  * debhelper v4.
+
+ -- Joey Hess <joeyh at debian.org>  Sat,  1 Jun 2002 16:31:53 -0400
+
 wmbattery (2.08) unstable; urgency=low
 
   * Don't crash if there is a /proc/acpi/ with no status file.
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
index 80da2a3..67781d4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
 Source: wmbattery
 Section: x11
 Priority: extra
-Build-Depends: debhelper (>= 3), xlibs-dev, autoconf, libapm-dev
+Build-Depends: debhelper (>= 4), xlibs-dev, autoconf, libapm-dev, dpkg-dev (>= 1.9.0)
 Maintainer: Joey Hess <joeyh at debian.org>
 Standards-Version: 3.5.6.1
 
 Package: wmbattery
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: wmaker
 Description: display laptop battery info, dockable in WindowMaker
  wmbattery displays the status of your laptop's battery in a small icon.
diff --git a/debian/rules b/debian/rules
index fe83329..fd3f1e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,4 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export DH_COMPAT=3
 
 build: build-stamp
 build-stamp:

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