[Pkg-samba-maint] r3957 - trunk/ctdb/debian

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-11-06 12:45:49 +0000 (Sun, 06 Nov 2011)
New Revision: 3957

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/rules
Log:
ctdb: converted to dh7

This removed a duplicate init.d postinst install

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2011-10-29 09:32:18 UTC (rev 3956)
+++ trunk/ctdb/debian/changelog	2011-11-06 12:45:49 UTC (rev 3957)
@@ -3,6 +3,7 @@
   * New upstream release
     - updated 92-apache-service-enable.diff 
   * Don't use /use/lib64 on ppc64 (Closes: #644907)
+  * d/rules: converted to dh7 
 
  -- Mathieu Parent <sathieu at debian.org>  Wed, 21 Sep 2011 22:07:40 +0200
 

Modified: trunk/ctdb/debian/rules
===================================================================
--- trunk/ctdb/debian/rules	2011-10-29 09:32:18 UTC (rev 3956)
+++ trunk/ctdb/debian/rules	2011-11-06 12:45:49 UTC (rev 3957)
@@ -27,99 +27,45 @@
 DESTDIR=$(CURDIR)/debian/tmp
 
 conf_args = \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
 		--localstatedir=/var/lib \
 		--with-logdir=/var/log/ctdb
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure $(conf_args)
-	touch $@
+%:
+	dh $@
 
-#Architecture 
-build: check-external-libs build-arch build-indep
+override_dh_auto_configure: check-external-libs
+	CFLAGS="$(CFLAGS)" dh_auto_configure -- $(conf_args)
 
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-	[ ! -f Makefile ] || $(MAKE)
-	touch $@
+override_dh_auto_test:
+	# skipping tests
 
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp
-	rm -f utils/smnotify/smnotify.h utils/smnotify/gen_smnotify.c
-	
-	rm -rf $(DESTDIR)
-	[ ! -f Makefile ] || $(MAKE) distclean
-	
-	dh_clean 
-
-install: install-indep install-arch
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_prep -i 
-	dh_installdirs -i
-	
-	dh_install -i
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_prep -s 
-	dh_installdirs -s
-	
-	$(MAKE) DESTDIR=$(DESTDIR) install
+override_dh_auto_install:
+	dh_auto_install
 	mkdir -p $(DESTDIR)/etc/default
 	install -m644 config/ctdb.sysconfig $(DESTDIR)/etc/default/ctdb
-	dh_install -s
 
-binary-common:
-	dh_testdir
-	dh_testroot
+override_dh_installdocs:
 	dh_installdocs
 ifeq ($(DEB_BUILD_ARCH_OS), hurd)
 	dh_installdocs debian/README.hurd
 endif
-	dh_installchangelogs 
 	#patch doc
 	sed -i 's|/etc/sysconfig/|/etc/default/|' $(CURDIR)/debian/ctdb/usr/share/doc/ctdb/web/*.html
 	#upstream changelog 
 	grep -A 10000 '%changelog' packaging/RPM/ctdb.spec.in > $(CURDIR)/debian/ctdb/usr/share/doc/ctdb/changelog
-	dh_installexamples
-	dh_installman
+
+override_dh_installinit:
 	#install init script
 	DH_OPTIONS= dh_installinit -pctdb --no-start --no-restart-on-upgrade
-	dh_installlogrotate
-	dh_lintian
-	dh_link
-	dh_compress 
-	dh_fixperms
+
+override_dh_strip:
 	dh_strip --dbg-package=ctdb-dbg
-	dh_makeshlibs
-	dh_shlibdeps
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+override_dh_auto_clean:
+	rm -f build-arch-stamp build-indep-stamp configure-stamp
+	rm -f utils/smnotify/smnotify.h utils/smnotify/gen_smnotify.c
+	dh_auto_clean
 
-binary: binary-arch binary-indep
-
 check-external-libs:
 	if [ -e lib/popt ]; then \
               echo " *****************************************"; \
@@ -133,4 +79,3 @@
 	      exit 1; \
         fi
 
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure