[pkg-java] r18706 - trunk/libapache-mod-jk/debian

[Markus Koschany]

Author: apo-guest
Date: 2015-05-21 19:31:57 +0000 (Thu, 21 May 2015)
New Revision: 18706

Modified:
   trunk/libapache-mod-jk/debian/changelog
   trunk/libapache-mod-jk/debian/rules
Log:
Ensure that libapache-mod-jk can be built twice in a row


Modified: trunk/libapache-mod-jk/debian/changelog
===================================================================
--- trunk/libapache-mod-jk/debian/changelog	2015-05-21 16:41:08 UTC (rev 18705)
+++ trunk/libapache-mod-jk/debian/changelog	2015-05-21 19:31:57 UTC (rev 18706)
@@ -14,6 +14,8 @@
       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.

Modified: trunk/libapache-mod-jk/debian/rules
===================================================================
--- trunk/libapache-mod-jk/debian/rules	2015-05-21 16:41:08 UTC (rev 18705)
+++ trunk/libapache-mod-jk/debian/rules	2015-05-21 19:31:57 UTC (rev 18706)
@@ -24,11 +24,40 @@
 	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)))
 	cd xdocs && install -d ../build/docs/ && cp -R * ../build/docs/