From e26c0906b6da8b69ce451ddda695a24b8c606acf Mon Sep 17 00:00:00 2001
From: Matthew Johnson <mjj29@hecate.matthew.ath.cx>
Date: Thu, 13 Dec 2007 10:37:53 +0000
Subject: patches and new version

---
 debian/rules | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 582b3c1..5d96d9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-export DH_COMPAT=4
 export DH_OPTIONS
 
 CFLAGS = -Wall -g
@@ -28,8 +27,8 @@ build: build-arch build-indep
 
 build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
-
-# Add here commands to compile the arch part of the package.
+	
+	# Add here commands to compile the arch part of the package.
 	$(MAKE)
 	touch build-arch-stamp
 
@@ -37,17 +36,17 @@ build-indep: build-indep-stamp
 build-indep-stamp: configure-stamp 
 	touch build-indep-stamp
 
-# Add here commands to compile the indep part of the package.
-#$(MAKE) doc
+	# Add here commands to compile the indep part of the package.
+	#$(MAKE) doc
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp configure-stamp
-
-# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-
+	
+	# Add here commands to clean up after the build process.
+	if [ -f Makefile ]; then $(MAKE) distclean; fi
+	
 	dh_clean
 
 install: install-arch #install-indep
@@ -57,34 +56,33 @@ install-indep:
 	dh_clean -k -i
 	dh_installdirs -i
 
-# Add here commands to install the indep part of the package into
-# debian/<package>-doc.
-#INSTALLDOC#
-#	$(MAKE) install-doc DESTDIR=$(CURDIR)/debian/tmp/ipmitool-doc
-#	dh_movefiles -i
+	# Add here commands to install the indep part of the package into
+	# debian/<package>-doc.
+	#INSTALLDOC#
+	#	$(MAKE) install-doc DESTDIR=$(CURDIR)/debian/tmp/ipmitool-doc
+	#	dh_movefiles -i
 
 install-arch:
 	dh_testdir
 	dh_testroot
 	dh_clean -k -a
 	dh_installdirs -a
-
-# Add here commands to install the arch part of the package into 
-# debian/tmp.
+	
+	# Add here commands to install the arch part of the package into 
+	# debian/tmp.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/ipmitool
-
+	
 	# No need to have two copies of the license text in the package.
 	$(RM) $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/COPYING
-
+	
 	# Move upstream changelog to correct filename.
-	mv $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/ChangeLog \
-	  $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/changelog
+	#mv $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/ChangeLog \
+	#  $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/changelog
 
 	# Compress to avoid lintian warning.  Not sure why dh_compress
 	# isn't fixing this.
-	gzip -9 $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/changelog
+	#gzip -9 $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/changelog
 
-#	dh_movefiles -a
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-multi
 # in another 'make' thread.
@@ -92,7 +90,7 @@ binary-common:
 	dh_testdir
 	dh_testroot
 	dh_installdocs
-	dh_installchangelogs 
+	dh_installchangelogs ChangeLog
 	dh_installinit --name ipmievd --error-handler=ipmievd_initd_failed
 	dh_link
 	dh_strip
-- 
cgit v1.2.3