[Amavisd-new-commits] [SCM] Debian packaging for amavisd-new branch, master, updated. debian/1%2.7.1-2-10-g339e688

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 339e6886be33fe2e9ce78518bced5515f9862777
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Jan 13 10:07:03 2013 +0100

    Start moving the package to dh9

diff --git a/debian/changelog b/debian/changelog
index 2589c04..229abcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+amavisd-new (1:2.8.0-1) UNRELEASED; urgency=low
+
+  * [f4f2bd4] Imported Upstream version 2.8.0
+  * [dfe69b5] Refresh 30_conf.d_support_builtin.dpatch
+  * [99628ab] Refresh 40_fix_paths.dpatch
+
+ -- Alexander Wirt <formorer at debian.org>  Sun, 13 Jan 2013 10:01:09 +0100
+
 amavisd-new (1:2.7.1-2) unstable; urgency=low
 
   * [02ccf50] Add free lha decompresser (Closes: #677692)
diff --git a/debian/control b/debian/control
index 8b4498b..ac3376c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: mail
 Priority: extra
 Maintainer: Brian May <bam at debian.org>
 Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Alexander Wirt <formorer at debian.org>
-Build-Depends: debhelper (>= 5), po-debconf, dpatch (>= 2), patch (>= 2.5.9-3bpo1), dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 9), po-debconf, dpatch (>= 2.0.32), patch (>= 2.5.9-3bpo1), dpkg-dev (>= 1.13.19)
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=amavisd-new/pkg-amavisd-new.git;a=summary
 Vcs-Git: git://anonscm.debian.org/amavisd-new/pkg-amavisd-new.git
diff --git a/debian/rules b/debian/rules
index 0464337..240ba11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,145 +1,7 @@
 #!/usr/bin/make -f
-# debian/rules file for amavisd-new 20021116 and newer
-# $Id: rules 1000 2006-11-04 04:35:10Z hmh $
-# GNU copyright 1997 to 1999 by Joey Hess.
-# GNU copyright 2003-2006 by Brian May and Henrique M. Holschuh
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DH_ALWAYS_EXCLUDE=CVS
-
-# Main package
-PACKAGE=amavisd-new
-
-# DPatch
-DEB_SOURCE_PACKAGE:=$(PACKAGE)
-include /usr/share/dpatch/dpatch.make
-
-# Other setup
-PKGDIR:=$(CURDIR)/debian/$(PACKAGE)
-TMP:=$(CURDIR)/debian/tmp
-
-# Should we ever need it for the helpers
-DEBUGFLAGS=-g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	DEBUGFLAGS += -O0
-else
-	DEBUGFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-CFLAGS +=$(DEBUGFLAGS)
-
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-	# Add here commands to configure the package.
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
-	touch build-stamp
-
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	rm -rf build
-
-	# Debian housekeeping
-	dh_clean
-	debconf-updatepo || true
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_install 
-
-	mkdir -p $(TMP)/usr/sbin
-	install -m 755 amavisd $(TMP)/usr/sbin/amavisd-new
-	install -m 755 amavisd-release amavisd-nanny amavisd-agent $(TMP)/usr/sbin
-	install -m 755 p0f-analyzer.pl $(TMP)/usr/sbin/p0f-analyzer
-	install -m 755 debian/amavisd-new-cronjob $(TMP)/usr/sbin/amavisd-new-cronjob
-
-	mkdir -p $(TMP)/usr/share/amavis
-	cp -r debian/conf $(TMP)/usr/share/amavis/conf.d
-
-	mkdir -p $(TMP)/usr/share/perl5
-	install -m 644 JpegTester.pm $(TMP)/usr/share/perl5/JpegTester.pm
-
-	mkdir -p $(TMP)/etc/amavis
-	cp -r debian/etc/* $(TMP)/etc/amavis
-	find $(TMP)/etc/amavis -type f -exec chmod 644 {} \;
-	find $(TMP)/etc/amavis -type d -exec chmod 755 {} \;
-
-	mkdir -p $(TMP)/etc/ldap/schema
-	install -m 644 LDAP.schema $(TMP)/etc/ldap/schema/amavis.schema
-
-	# Install lintian and linda overrides, if any
-	cd debian ; \
-	for i in *.linda ; do \
-	    [ -r "$$i" ] && { \
-		mkdir -p "$${i%%.linda}/usr/share/linda/overrides" ;\
-		install  -m 644 "$$i" "$${i%%.linda}/usr/share/linda/overrides/$${i%%.linda}" ;\
-	    } ;\
-	done ;\
-	for i in *.lintian ; do \
-	    [ -r "$$i" ] && { \
-		mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
-		install  -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
-	    } ;\
-	done
-
-	dh_movefiles
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdebconf -i -n
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installmenu -i
-	dh_install
-	chmod +x debian/amavisd-new/etc/spamassassin/sa-update-hooks.d/amavisd-new
-#	dh_installlogrotate
-#	dh_installpam
-#	dh_installmime
-	dh_installinit -i --error-handler=init_failed --init-script=amavis -- defaults 19 21
-	dh_installcron -i
-	dh_installman -i
-	dh_installinfo -i
-	dh_installchangelogs -i -k RELEASE_NOTES
-	dh_link -i
-	dh_strip -i
-	dh_compress -i
-	dh_fixperms -i
-#	dh_makeshlibs
-	dh_installdeb -i
-	dh_perl -i
-	dh_shlibdeps -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: 
-
-binary: binary-indep binary-arch
-.PHONY: build clean clean-patched binary-indep binary-arch binary install configure
-
-#  Extracts upstream templates on top of the Debian ones for en_US
-update-templates-from-upstream:
-	( chmod +x debian/extract-upstream-en_US-templates.pl && \
-	  cd debian/etc/en_US && \
-	  ../../extract-upstream-en_US-templates.pl < ../../../amavisd )
-
-.PHONY: update-templates-from-upstream
+%:
+	dh $@ --with dpatch

-- 
Debian packaging for amavisd-new