[SCM] proftpd-mod-dnsbl branch, master, updated. upstream/0.1.5-9-gb24c90a

[Mahyuddin Susanto]

The following commit has been merged in the master branch:
commit b24c90a4d66d176889b8a5893409de4cff87f825
Author: Mahyuddin Susanto <udienz at ubuntu.com>
Date:   Mon Mar 7 23:05:45 2011 +0700

    modify d/rules to make simply rules and add makefile patch

diff --git a/debian/patches/01_makefile.patch b/debian/patches/01_makefile.patch
new file mode 100644
index 0000000..4250227
--- /dev/null
+++ b/debian/patches/01_makefile.patch
@@ -0,0 +1,21 @@
+Description: Sync makefile compability to run dh_auto_build
+Author: Mahyuddin Susanto <udienz at ubuntu.com>
+--- proftpd-mod-dnsbl-0.1.5.orig/Makefile.in
++++ proftpd-mod-dnsbl-0.1.5/Makefile.in
+@@ -2,7 +2,7 @@ top_builddir=../..
+ top_srcdir=../../
+ srcdir=@srcdir@
+ 
+-include $(top_srcdir)/Make.rules
++#include $(top_srcdir)/Make.rules
+ 
+ .SUFFIXES: .la .lo
+ 
+@@ -42,6 +42,6 @@ clean:
+ 	$(LIBTOOL) --mode=clean $(RM) "$(MODULE_NAME).o"
+ 	$(LIBTOOL) --mode=clean $(RM) `echo "$(MODULE_NAME).la" | sed 's/\.la$\/.lo/g'`
+ 
+-dist: clean
++distclean: clean
+ 	$(RM) Makefile mod_dnsbl.h config.status config.cache config.log
+ 	-$(RM) -r .libs/ CVS/ RCS/
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..973c513
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_makefile.patch
diff --git a/debian/proftpd-mod-dnsbl.install b/debian/proftpd-mod-dnsbl.install
new file mode 100644
index 0000000..075c61f
--- /dev/null
+++ b/debian/proftpd-mod-dnsbl.install
@@ -0,0 +1 @@
+debian/templates/dnsbl.conf usr/share/doc/proftpd-mod-dnsbl/
diff --git a/debian/proftpd-mod-dnsbl.links b/debian/proftpd-mod-dnsbl.links
new file mode 100644
index 0000000..c27c7f1
--- /dev/null
+++ b/debian/proftpd-mod-dnsbl.links
@@ -0,0 +1 @@
+usr/share/doc/proftpd-mod-dnsbl/dnsbl.conf usr/share/proftpd/templates/dnsbl.conf
diff --git a/debian/rules b/debian/rules
index 0a4ff8f..344f80f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,83 +1,22 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-MOD_NAME=dnsbl
-MOD_FULLNAME=mod_dnsbl
-MOD_DEBNAME=proftpd-mod-dnsbl
-
+export DH_VERBOSE=1
 VERSION=$(shell grep PROFTPD_VERSION_TEXT /usr/include/proftpd/version.h|cut -d\" -f2)
-
-DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+MODULE_NAME=mod_dnsbl
+DEBNAME=proftpd-mod-dnsbl
 
 debian/control: debian/control.in
 	sed -e 's/@VERSION@/$(VERSION)/' $< >$@
 
-debian/proftpd-mod-dnsbl-substvars: debian/proftpd-mod-dnsbl-substvars.in
-	sed -e 's/@VERSION@/$(VERSION)/' $< >$@
-
-clean: debian/control
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp *.la *.lo *.o
-	rm -rf .libs/
-	dh_clean
-
-config.status: debian/control configure
-	dh_testdir
-	dh_auto_configure
-	
-build: build-stamp
-
-build-stamp: config.status
-	dh_testdir
-	touch build-stamp
+%:
+	dh $@
 
-install: build
-	dh_prep
-	dh_installdirs
-	prxs -c $(MOD_FULLNAME).c
+override_dh_auto_configure: debian/control
+	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 
-# Build architecture-independent files here.
-binary-arch: build install
-	dh_installdirs
-	dh_install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs 
-	dh_strip
-	dh_link
-	
-	install -m 644 debian/templates/$(MOD_NAME).conf debian/$(MOD_DEBNAME)/usr/share/doc/$(MOD_DEBNAME)/$(MOD_NAME).conf
-	install -m 644 .libs/mod_dnsbl.so debian/$(MOD_DEBNAME)/usr/lib/proftpd
+override_dh_auto_build:
+	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -c $(MODULE_NAME).c
 	
-	dh_link usr/share/doc/$(MOD_DEBNAME)/$(MOD_NAME).conf usr/share/proftpd/templates/$(MOD_NAME).conf
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-indep: build
-	dh_installdirs
-	dh_install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs 
-	dh_strip
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_install:
+	DESTDIR=$(CURDIR)/debian/$(DEBNAME) prxs -i -c $(MODULE_NAME).c

-- 
mod_dnsbl for proFTPD