* Use more debhelper functions to simplify debian/rules.

* Add misc-depends to various packages to make lintian happy.
* Change build-dep from libcap2-dev to libcap-dev because of package rename.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1112 01b336ce-410b-0410-9a02-a0e7f243c266

20 files changed, 65 insertions, 68 deletions

diff --git a/debian/apache2-mpm-event.dirs b/debian/apache2-mpm-event.dirs
deleted file mode 100644
index 72701f18..00000000
--- a/debian/apache2-mpm-event.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/sbin
-usr/lib/debug/usr/sbin
diff --git a/debian/apache2-mpm-itk.dirs b/debian/apache2-mpm-itk.dirs
deleted file mode 100644
index 72701f18..00000000
--- a/debian/apache2-mpm-itk.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/sbin
-usr/lib/debug/usr/sbin
diff --git a/debian/apache2-mpm-prefork.dirs b/debian/apache2-mpm-prefork.dirs
deleted file mode 100644
index 72701f18..00000000
--- a/debian/apache2-mpm-prefork.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/sbin
-usr/lib/debug/usr/sbin
diff --git a/debian/apache2-mpm-worker.dirs b/debian/apache2-mpm-worker.dirs
deleted file mode 100644
index 72701f18..00000000
--- a/debian/apache2-mpm-worker.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/sbin
-usr/lib/debug/usr/sbin
diff --git a/debian/apache2-utils.install b/debian/apache2-utils.install
index f9f2087b..636cc17f 100644
--- a/debian/apache2-utils.install
+++ b/debian/apache2-utils.install
@@ -15,3 +15,5 @@ usr/sbin/rotatelogs
 usr/share/man/man8/rotatelogs.8
 usr/sbin/htcacheclean
 usr/share/man/man8/htcacheclean.8
+support/check_forensic				usr/sbin
+debian/build-tree/worker/support/split-logfile	usr/sbin
diff --git a/debian/apache2.2-bin.dirs b/debian/apache2.2-bin.dirs
index 0d617d22..57ced466 100644
--- a/debian/apache2.2-bin.dirs
+++ b/debian/apache2.2-bin.dirs
@@ -1,3 +1,4 @@
 usr/lib/apache2/mpm-worker
 usr/lib/apache2/mpm-prefork
 usr/lib/apache2/mpm-event
+usr/lib/apache2/mpm-itk
diff --git a/debian/apache2.2-common.bug.control b/debian/apache2.2-common.bug-control
index 4955a757..4955a757 100644
--- a/debian/apache2.2-common.bug.control
+++ b/debian/apache2.2-common.bug-control
diff --git a/debian/apache2.2-common.bug.script b/debian/apache2.2-common.bug-script
index e7232e2d..e7232e2d 100755
--- a/debian/apache2.2-common.bug.script
+++ b/debian/apache2.2-common.bug-script
diff --git a/debian/apache2.2-common.install b/debian/apache2.2-common.install
index aac5f6c6..e15caa1e 100644
--- a/debian/apache2.2-common.install
+++ b/debian/apache2.2-common.install
@@ -1,5 +1,7 @@
 usr/share/apache2/icons
 usr/sbin/apache2ctl
 usr/share/apache2/error
-usr/sbin/envvars-std usr/share/apache2/build
-etc/apache2 usr/share/doc/apache2.2-common/examples
+usr/sbin/envvars-std	usr/share/apache2/build
+etc/apache2		usr/share/doc/apache2.2-common/examples
+debian/config-dir/*	etc/apache2
+debian/a2enmod		usr/sbin
diff --git a/debian/apache2.2-common.links b/debian/apache2.2-common.links
new file mode 100644
index 00000000..ee7cf7df
--- /dev/null
+++ b/debian/apache2.2-common.links
@@ -0,0 +1,3 @@
+usr/sbin/a2enmod usr/sbin/a2dismod
+usr/sbin/a2enmod usr/sbin/a2ensite
+usr/sbin/a2enmod usr/sbin/a2dissite
diff --git a/debian/apache2.bug.control b/debian/apache2.bug-control
index caf26ccb..caf26ccb 100644
--- a/debian/apache2.bug.control
+++ b/debian/apache2.bug-control
diff --git a/debian/apache2.dirs b/debian/apache2.dirs
new file mode 100644
index 00000000..5cf2f9f8
--- /dev/null
+++ b/debian/apache2.dirs
@@ -0,0 +1 @@
+usr/share/bug/apache2
diff --git a/debian/apache2.links b/debian/apache2.links
new file mode 100644
index 00000000..bf33d831
--- /dev/null
+++ b/debian/apache2.links
@@ -0,0 +1 @@
+usr/share/bug/apache2.2-common/script usr/share/bug/apache2/script
diff --git a/debian/changelog b/debian/changelog
index 21e1907b..7c003922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ apache2 (2.2.14-5) UNRELEASED; urgency=low
   * Add hint README.Debian on how to pass auth info to CGI scripts.
     Closes: #483219
   * Point to README.backtrace in apache2-dbg's description.
+  * Use more debhelper functions to simplify debian/rules.
+  * Add misc-depends to various packages to make lintian happy.
+  * Change build-dep from libcap2-dev to libcap-dev because of package rename.
 
  -- Stefan Fritsch <sf@debian.org>  Sat, 02 Jan 2010 17:41:40 +0100
 
diff --git a/debian/clean b/debian/clean
index 29342e18..acc04f19 100644
--- a/debian/clean
+++ b/debian/clean
@@ -2,17 +2,27 @@ debian/apache2-mpm-worker.postinst
 debian/apache2-mpm-worker.preinst
 debian/apache2-mpm-worker.prerm
 debian/apache2-mpm-worker.lintian-overrides
+debian/apache2-mpm-worker.dirs
+debian/apache2-mpm-worker.links
 debian/apache2-mpm-event.postinst
 debian/apache2-mpm-event.preinst
 debian/apache2-mpm-event.prerm
 debian/apache2-mpm-event.lintian-overrides
+debian/apache2-mpm-event.dirs
+debian/apache2-mpm-event.links
 debian/apache2-mpm-prefork.postinst
 debian/apache2-mpm-prefork.preinst
 debian/apache2-mpm-prefork.prerm
 debian/apache2-mpm-prefork.lintian-overrides
+debian/apache2-mpm-prefork.dirs
+debian/apache2-mpm-prefork.links
 debian/apache2-mpm-itk.postinst
 debian/apache2-mpm-itk.preinst
 debian/apache2-mpm-itk.prerm
 debian/apache2-mpm-itk.lintian-overrides
+debian/apache2-mpm-itk.dirs
+debian/apache2-mpm-itk.links
 debian/apache2-prefork-dev.postinst
 debian/apache2-threaded-dev.postinst
+debian/tmp-worker
+debian/tmp-prefork
diff --git a/debian/control b/debian/control
index 185899f8..a5b21f30 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: httpd
 Priority: optional
 Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
 Uploaders: Tollef Fog Heen <tfheen@debian.org>, Thom May <thom@debian.org>, Adam Conrad <adconrad@0c3.net>, Peter Samuelson <peter@p12n.org>, Stefan Fritsch <sf@debian.org>, Steinar H. Gunderson <sesse@debian.org>
-Build-Depends: debhelper (>= 7), dpatch, lsb-release, libaprutil1-dev (>= 1.3.4), libapr1-dev (>= 1.2.7-6), openssl, libpcre3-dev, mawk, zlib1g-dev, libssl-dev, sharutils, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], autoconf
+Build-Depends: debhelper (>= 7.4.3), dpatch, lsb-release, libaprutil1-dev (>= 1.3.4), libapr1-dev (>= 1.2.7-6), openssl, libpcre3-dev, mawk, zlib1g-dev, libssl-dev, sharutils, libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], autoconf
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.3
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2
@@ -12,7 +12,7 @@ Homepage: http://httpd.apache.org/
 
 Package: apache2.2-common
 Architecture: any
-Depends: apache2.2-bin (= ${binary:Version}), apache2-utils, libmagic1, mime-support, lsb-base, procps [!hurd-i386], perl
+Depends: ${misc:Depends}, apache2.2-bin (= ${binary:Version}), apache2-utils, libmagic1, mime-support, lsb-base, procps [!hurd-i386], perl
 Recommends: ssl-cert
 Suggests: www-browser, apache2-doc, apache2-suexec | apache2-suexec-custom
 Conflicts: apache2-common, libapache2-mod-php5 (<= 5.1.6-3), libapache2-mod-php4 (<= 4:4.4.4-2), libapache2-mod-mime-xattr (<= 0.3-2), libapache2-mod-mono (<= 1.1.17-3), libapache2-mod-proxy-html (<= 2.4.3-2), libapache2-mod-scgi (<= 1.11-1), libapache2-mod-speedycgi (<= 2.22-3), libapache2-modxslt (<= 2005072700-1), libapache2-redirtoservername (<= 0.1-1), libapache2-webauth (<= 3.5.3-1), libapache2-webkdc (<= 3.5.3-1)
@@ -43,7 +43,7 @@ Description: Apache HTTP Server common binary files
 
 Package: apache2-mpm-worker
 Architecture: any
-Depends: apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
+Depends: ${misc:Depends}, apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
 Provides: apache2-mpm, apache2, httpd, httpd-cgi
 Conflicts: apache2-mpm, apache2-common
 Replaces: apache2-mpm-threadpool (<< 2.0.53), apache2-mpm-perchild (<< 2.2.0)
@@ -57,7 +57,7 @@ Description: Apache HTTP Server - high speed threaded model
 
 Package: apache2-mpm-prefork
 Architecture: any
-Depends: apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
+Depends: ${misc:Depends}, apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
 Provides: apache2-mpm, apache2, httpd, httpd-cgi
 Conflicts: apache2-mpm, apache2-common
 Description: Apache HTTP Server - traditional non-threaded model
@@ -74,7 +74,7 @@ Description: Apache HTTP Server - traditional non-threaded model
 
 Package: apache2-mpm-event
 Architecture: any
-Depends: apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
+Depends: ${misc:Depends}, apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
 Provides: apache2-mpm, apache2, httpd, httpd-cgi
 Conflicts: apache2-mpm, apache2-common
 Description: Apache HTTP Server - event driven model
@@ -89,7 +89,7 @@ Description: Apache HTTP Server - event driven model
  This MPM is experimental and less tested than the worker and prefork MPMs.
  
 Package: apache2-mpm-itk
-Depends: apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
+Depends: ${misc:Depends}, apache2.2-common (= ${binary:Version}), apache2.2-bin (= ${binary:Version})
 Provides: apache2-mpm, apache2, httpd, httpd-cgi
 Conflicts: apache2-mpm, apache2-common
 Architecture: any
@@ -109,7 +109,7 @@ Package: apache2-utils
 Architecture: any
 Replaces: apache2-common, apache-utils (<< 1.3.33-4)
 Conflicts: apache-common (<< 1.3.28.0.1-1)
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: utility programs for webservers
  Provides some add-on programs useful for any webserver.  These include:
   - ab (Apache benchmark tool)
@@ -126,7 +126,7 @@ Description: utility programs for webservers
 Package: apache2-suexec
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, apache2.2-common
+Depends: ${misc:Depends}, ${shlibs:Depends}, apache2.2-common
 Conflicts: apache2-suexec, apache-common
 Replaces: apache2-suexec
 Description: Standard suexec program for Apache 2 mod_suexec
@@ -137,7 +137,7 @@ Description: Standard suexec program for Apache 2 mod_suexec
 Package: apache2-suexec-custom
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, apache2.2-common
+Depends: ${misc:Depends}, ${shlibs:Depends}, apache2.2-common
 Provides: apache2-suexec
 Conflicts: apache2-suexec, apache-common
 Replaces: apache2-suexec
@@ -152,7 +152,7 @@ Description: Configurable suexec program for Apache 2 mod_suexec
 
 Package: apache2
 Architecture: any
-Depends: apache2-mpm-worker (= ${binary:Version}) | apache2-mpm-prefork (= ${binary:Version}) | apache2-mpm-event (= ${binary:Version}) | apache2-mpm-itk (= ${binary:Version}), apache2.2-common (= ${binary:Version})
+Depends: ${misc:Depends}, apache2-mpm-worker (= ${binary:Version}) | apache2-mpm-prefork (= ${binary:Version}) | apache2-mpm-event (= ${binary:Version}) | apache2-mpm-itk (= ${binary:Version}), apache2.2-common (= ${binary:Version})
 Description: Apache HTTP Server metapackage         
  The Apache Software Foundation's goal is to build a secure, efficient and
  extensible HTTP server as standards-compliant open source software. The
@@ -165,13 +165,14 @@ Description: Apache HTTP Server metapackage
 Package: apache2-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: Apache HTTP Server documentation
  This package provides the documentation for Apache 2. For more details
  see the apache2 package description.
 
 Package: apache2-prefork-dev
 Architecture: any
-Depends: apache2.2-common (= ${binary:Version}), openssl, libaprutil1-dev
+Depends: ${misc:Depends}, apache2.2-common (= ${binary:Version}), openssl, libaprutil1-dev
 Conflicts: apache2-threaded-dev
 Priority: extra
 Description: Apache development headers - non-threaded MPM
@@ -183,7 +184,7 @@ Description: Apache development headers - non-threaded MPM
 
 Package: apache2-threaded-dev
 Architecture: any
-Depends: apache2.2-common (= ${binary:Version}), openssl, libaprutil1-dev
+Depends: ${misc:Depends}, apache2.2-common (= ${binary:Version}), openssl, libaprutil1-dev
 Conflicts: apache2-prefork-dev
 Provides: apache2-dev
 Priority: extra
@@ -196,7 +197,7 @@ Package: apache2-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: apache2.2-bin (= ${binary:Version})
+Depends: ${misc:Depends}, apache2.2-bin (= ${binary:Version})
 Description: Apache debugging symbols
  This package includes the debugging symbols for Apache 2.
  See /usr/share/doc/apache2.2-common/README.backtrace for more information.
diff --git a/debian/mpms.dirs b/debian/mpms.dirs
new file mode 100644
index 00000000..6129ada8
--- /dev/null
+++ b/debian/mpms.dirs
@@ -0,0 +1,5 @@
+usr/sbin
+usr/lib/debug/usr/sbin
+usr/lib/apache2/mpm-MPMXXX
+usr/share/lintian/overrides
+usr/share/bug/apache2-mpm-MPMXXX
diff --git a/debian/mpms.links b/debian/mpms.links
new file mode 100644
index 00000000..cef047b0
--- /dev/null
+++ b/debian/mpms.links
@@ -0,0 +1,3 @@
+usr/lib/apache2/mpm-MPMXXX/apache2			usr/sbin/apache2
+usr/lib/debug/usr/lib/apache2/mpm-MPMXXX/apache2	usr/lib/debug/usr/sbin/apache2
+usr/share/bug/apache2.2-common/script			usr/share/bug/apache2-mpm-MPMXXX/script
diff --git a/debian/mpms.postinst b/debian/mpms.postinst
index 1e9847e1..657c7a70 100644
--- a/debian/mpms.postinst
+++ b/debian/mpms.postinst
@@ -5,7 +5,7 @@ if [ "$1" != "configure" ]; then
         exit 0
 fi
 
-P=xxx
+P=apache2-mpm-MPMXXX
 if [ $P = apache2-mpm-prefork ] || [ $P = apache2-mpm-itk ]; then
 	CGI_DIS=cgid
 	CGI_EN=cgi
diff --git a/debian/rules b/debian/rules
index 55fd3836..1c910449 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,6 +97,7 @@ INSTALL=/usr/bin/install
 clean: unpatch
 	dh_testdir
 	rm -rf $(BUILD) mpm-worker mpm-prefork mpm-event mpm-itk install
+	rm -rf debian/tmp-worker debian/tmp-prefork
 	dh_clean
 
 build: patch-stamp build-stamp 
@@ -147,26 +148,25 @@ mpm-worker mpm-prefork mpm-event mpm-itk: mpm-%: patch-stamp mpm-%.scripts-stamp
 	./apache2 -l |grep -v $* > mods.list
 	touch $@
 
-mpm-%.scripts-stamp: debian/mpms.postinst debian/mpms.preinst debian/mpms.prerm debian/mpms.lintian-overrides
-	for f in postinst preinst prerm; do \
-		perl -p -e s/P=xxx/P=apache2-mpm-$*/ < debian/mpms.$$f > debian/apache2-mpm-$*.$$f ;\
+mpm-%.scripts-stamp: debian/mpms.postinst debian/mpms.preinst debian/mpms.prerm debian/mpms.lintian-overrides debian/mpms.dirs debian/mpms.links
+	for f in postinst preinst prerm links dirs ; do \
+		perl -p -e "s/MPMXXX/$*/g" < debian/mpms.$$f > debian/apache2-mpm-$*.$$f ;\
 	done
 	perl -p -e "s/^/apache2-mpm-$*: /" < debian/mpms.lintian-overrides > debian/apache2-mpm-$*.lintian-overrides
 	touch $@ 
  
-install-%: mpm-%
+install-worker: mpm-worker
 	dh_testdir
 	dh_testroot
-	dh_installdirs
-	cd $(BUILD)/$* ;\
-	$(MAKE) DESTDIR=$(REALCURDIR)/debian/apache2-mpm-$* install
+	cd $(BUILD)/worker ;\
+	$(MAKE) DESTDIR=$(REALCURDIR)/debian/tmp install
+	ln -sf tmp debian/tmp-worker
 
-install-common: install-worker
+install-prefork: mpm-prefork
 	dh_testdir
 	dh_testroot
-	dh_installdirs
-	cd $(BUILD)/worker ;\
-	$(MAKE) DESTDIR=$(REALCURDIR)/debian/tmp install
+	cd $(BUILD)/prefork ;\
+	$(MAKE) DESTDIR=$(REALCURDIR)/debian/tmp-prefork install
 
 install-dev: install-worker install-prefork
 	dh_testdir
@@ -178,8 +178,8 @@ install-dev: install-worker install-prefork
 		else \
 			TARGET=threaded ;\
 		fi ;\
-		cp debian/apache2-mpm-$$i/usr/include/apache2/* debian/apache2-$$TARGET-dev/usr/include/apache2/ ;\
-		cp debian/apache2-mpm-$$i/usr/share/apache2/build/* debian/apache2-$$TARGET-dev/usr/share/apache2/build/ ;\
+		cp debian/tmp-$$i/usr/include/apache2/* debian/apache2-$$TARGET-dev/usr/include/apache2/ ;\
+		cp debian/tmp-$$i/usr/share/apache2/build/* debian/apache2-$$TARGET-dev/usr/share/apache2/build/ ;\
 		cp $(BUILD)/$$i/support/apxs debian/apache2-$$TARGET-dev/usr/bin/apxs2 ;\
 		perl -p -e s/^P=apache2/P=apache2-$${TARGET}-dev/ < debian/apache2.postinst > debian/apache2-$${TARGET}-dev.postinst ;\
 	done
@@ -195,9 +195,10 @@ install-dev: install-worker install-prefork
 		mv tmp_config_vars.mk config_vars.mk ) ; \
 	done
 
-install: build install-worker install-prefork install-common install-dev
+install: build install-dev
 	dh_testroot
 	dh_testdir
+	dh_installdirs
 
 	#cleanup of death
 	rm -rf debian/tmp/etc/apache2/original
@@ -218,11 +219,9 @@ install: build install-worker install-prefork install-common install-dev
 		uudecode -o debian/tmp/usr/share/apache2/icons/$$i debian/icons/$$i".uue"; \
 	done
 
-	dh_install --list-missing --sourcedir=debian/tmp
+	dh_install --list-missing
 
 	cp debian/bash_completion debian/apache2.2-common/etc/bash_completion.d/apache2.2-common
-	install -m755 debian/apache2.2-common.bug.script debian/apache2.2-common/usr/share/bug/apache2.2-common/script
-	install -m644 debian/apache2.2-common.bug.control debian/apache2.2-common/usr/share/bug/apache2.2-common/control
 
 	# standard suexec
 	chmod 4754 debian/apache2-suexec/usr/lib/apache2/suexec 
@@ -231,7 +230,6 @@ install: build install-worker install-prefork install-common install-dev
 	chmod 644 debian/apache2.2-bin/usr/lib/apache2/modules/mod_suexec.so
 
 	# configurable suexec
-	mkdir -p debian/apache2-suexec-custom/usr/lib/apache2 debian/apache2-suexec-custom/etc/apache2/suexec
 	cp debian/build-tree/worker/support/suexec-custom debian/apache2-suexec-custom/usr/lib/apache2/suexec
 	cp debian/suexec-custom.config debian/apache2-suexec-custom/etc/apache2/suexec/www-data
 	chmod 4754 debian/apache2-suexec-custom/usr/lib/apache2/suexec 
@@ -252,31 +250,11 @@ install: build install-worker install-prefork install-common install-dev
 	rmdir debian/apache2-doc/usr/share/doc/apache2-doc/manual/style/xsl
 	rm -r debian/apache2-doc/usr/share/doc/apache2-doc/manual.orig
 
-	#apache2-utils extras
-	cp support/check_forensic debian/apache2-utils/usr/sbin/check_forensic
-	cp $(BUILD)/worker/support/split-logfile debian/apache2-utils/usr/sbin/split-logfile
-	chmod 755 debian/apache2-utils/usr/sbin/split-logfile
-
-	cp -a debian/config-dir/* debian/apache2.2-common/etc/apache2
 	cp debian/logrotate debian/apache2.2-common/etc/logrotate.d/apache2
-	
-	install -m755 debian/a2enmod debian/apache2.2-common/usr/sbin
-	ln -s a2enmod debian/apache2.2-common/usr/sbin/a2dismod
-	ln -s a2enmod debian/apache2.2-common/usr/sbin/a2ensite
-	ln -s a2enmod debian/apache2.2-common/usr/sbin/a2dissite
 	cp debian/default-index.html debian/apache2.2-common/usr/share/apache2/default-site/index.html
 
 	for i in worker prefork event itk; do \
-		rm -rf debian/apache2-mpm-$$i/ ;\
-		mkdir -p debian/apache2-mpm-$$i/usr/sbin ;\
-		mkdir -p debian/apache2-mpm-$$i/usr/lib/debug/usr/sbin ;\
-		mkdir -p debian/apache2.2-bin/usr/lib/apache2/mpm-$$i ;\
 		install -m 755 $(BUILD)/$$i/apache2 debian/apache2.2-bin/usr/lib/apache2/mpm-$$i/apache2 ;\
-		ln -s /usr/lib/apache2/mpm-$$i/apache2 debian/apache2-mpm-$$i/usr/sbin/apache2 ;\
-		ln -s ../lib/apache2/mpm-$$i/apache2 debian/apache2-mpm-$$i/usr/lib/debug/usr/sbin/apache2 ;\
-		mkdir -p debian/apache2-mpm-$$i/usr/share/lintian/overrides ;\
-		mkdir -p debian/apache2-mpm-$$i/usr/share/bug/apache2-mpm-$$i ;\
-		ln -s ../apache2.2-common/script debian/apache2-mpm-$$i/usr/share/bug/apache2-mpm-$$i ;\
 	done
 
 	for pkg in `awk '/^Package:/ { print $$2 }' debian/control`; do \
@@ -284,16 +262,11 @@ install: build install-worker install-prefork install-common install-dev
 	done
 
 	# common dh stuff
-	dh_testdir
-	dh_testroot
-	dh_installdirs
 	dh_installdocs debian/README.backtrace -papache2.2-common -papache2.2-bin
 	dh_installdocs debian/README.backtrace -Napache2.2-common -Napache2.2-bin
-	mkdir -p debian/apache2/usr/share/bug/apache2
-	ln -sf ../apache2.2-common/script debian/apache2/usr/share/bug/apache2
-	install -m644 debian/apache2.bug.control debian/apache2/usr/share/bug/apache2/control
 	cp debian/README.Debian debian/apache2-doc/usr/share/doc/apache2-doc/
 	dh_installman
+	dh_bugfiles
 	dh_installinit --no-start -r --name=apache2 -- defaults 91 09
 	dh_installcron --name=apache2
 	dh_installchangelogs CHANGES -Napache2-suexec -Napache2-suexec-custom -Napache2