add bug closure to changelog

[debian/amanda] / debian / rules

diff --git a/debian/rules b/debian/rules
index f3918a45f104bd6a7f8b19c3f00e2016b271f7a1..d8c11ee369e0d982bf9b50f8ba4aadca2f467f25 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
-# debian/rules for amanda using debhelper
-# Copyright 1998-2009 by Bdale Garbee.  License GPL v2
+# Copyright 1998-2011 by Bdale Garbee.  License GPL v2
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
 
 r=$(shell pwd)/debian/amanda-common
 s=$(shell pwd)/debian/amanda-server
@@ -48,10 +49,12 @@ configure-stamp:
        touch missing
        touch configure-stamp
 
-build: build-stamp 
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp: configure-stamp
        dh_testdir
-       MAILER=/usr/bin/mail $(MAKE) CFLAGS="-O2 -g -Wall \
+       MAILER=/usr/bin/mail $(MAKE) CFLAGS="$(CFLAGS) -O2 -g -Wall \
                -DAMANDATES_FILE='\"/var/lib/amanda/amandates\"' \
                -DIGNORE_TAR_ERRORS "
        touch build-stamp
@@ -83,13 +86,12 @@ binary-arch: build
        dh_installdocs -a
        dh_installexamples -a
        cp ChangeLog $(r)/usr/share/doc/amanda-common/changelog
-       cp debian/xinetd.d/amandaidx $(s)/etc/xinetd.d
-       cp debian/xinetd.d/amidxtape $(s)/etc/xinetd.d
-       cp debian/xinetd.d/amanda $(r)/etc/xinetd.d                     
+       cp example/xinetd.amandaserver $(r)/etc/xinetd.d/amanda
        dh_installmenu -a
        dh_installcron -a
        dh_installchangelogs -a
        dh_installdebconf -a
+       dh_installman -a
        dh_strip -a
        dh_compress -a
        dh_movefiles -a --sourcedir=debian/amanda-common
@@ -98,8 +100,6 @@ binary-arch: build
        # fix perms manually
        chown -R backup:backup debian/*/var/lib/*
        chmod -R u=rwX,g=rwX,o-rwx debian/*/var/lib/*
-       chown -R backup:backup $(s)/var/log/amanda
-       chmod -R u=rwX,g=rwX,o-rwx $(s)/var/log/amanda
        chown -R backup:backup $(s)/etc/amanda
        chmod -R u=rwX,g=rwX,o-rwx $(s)/etc/amanda
        chown -R backup:backup $(c)/var/lib/amanda/gnutar-lists
@@ -149,4 +149,4 @@ source diff:
        @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: configure build-indep build-arch build clean binary-indep binary-arch binary