[libapache-mod-jk] 48/65: Ensure that libapache-mod-jk can be built twice in a row

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository libapache-mod-jk.

commit 2e3cf79aea299df78a7550f51d87f1ac6c50022e
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu May 21 19:31:57 2015 +0000

    Ensure that libapache-mod-jk can be built twice in a row
---
 debian/changelog |  2 ++
 debian/rules     | 35 ++++++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d0dcee..5173be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ libapache-mod-jk (1:1.2.40+svn150520-1) unstable; urgency=high
       release.
     - Run buildconf.sh before dh_auto_configure step since this is a requirement
       for building SVN snapshots.
+    - Update dh_auto_clean override. Ensure that the package can be built twice
+      in a row.
   * debian/control:
     - Add autoconf to Build-Depends.
     - Add automake to Build-Depends.
diff --git a/debian/rules b/debian/rules
index 876dfbe..760a3a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,10 +24,39 @@ override_dh_auto_clean:
 	apache-2.0/Makefile apache-2.0/Makefile.apxs common/Makefile \
 	common/list.mk common/jk_types.h jni/Makefile
 	# MAINTAINERCLEANFILES
-	rm -f native/config.{status,log,cache}
-	rm -f native/apache-2.0/mod_jk.{o,la,lo,a} native/apache-2.0/mod_jk.so*
-	rm -f native/common/*.{lo,o}
+	rm -f native/config.status
+	rm -f native/config.log
+	rm -f native/config.cache
+	rm -f native/common/*.o
+	rm -f native/common/*.lo
+	rm -f native/apache-2.0/mod_jk.a
+	rm -f native/apache-2.0/mod_jk.so*
+	rm -f native/apache-2.0/mod_jk.o
+	rm -f native/apache-2.0/mod_jk.lo
+	rm -f native/apache-2.0/mod_jk.la
+	rm -rf build/docs/
 	rm -rf native/apache-2.0/.libs native/common/.libs
+	rm -f native/Makefile
+	rm -f native/Makefile.in
+	rm -f native/aclocal.m4
+	rm -f native/apache-1.3/Makefile
+	rm -f native/apache-1.3/Makefile.apxs
+	rm -f native/apache-2.0/Makefile
+	rm -f native/apache-2.0/Makefile.apxs
+	rm -f native/common/Makefile
+	rm -f native/common/config.h
+	rm -f native/common/config.h.in
+	rm -f native/common/jk_types.h
+	rm -f native/common/list.mk
+	rm -f native/common/stamp-h1
+	rm -f native/config.nice
+	rm -f native/configure
+	rm -f native/libtool
+	rm -f native/scripts/build/unix/compile
+	rm -f native/scripts/build/unix/install-sh
+	rm -f native/scripts/build/unix/ltmain.sh
+	rm -f native/scripts/build/unix/missing
+
 
 override_dh_auto_install:
 ifneq (,$(filter libapache-mod-jk-doc, $(shell dh_listpackages)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libapache-mod-jk.git