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

[Damien Raude-Morvan]

Author: drazzib
Date: 2012-02-05 23:36:49 +0000 (Sun, 05 Feb 2012)
New Revision: 15763

Modified:
   trunk/libapache-mod-jk/debian/changelog
   trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
   trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
   trunk/libapache-mod-jk/debian/rules
Log:
* d/*.{prerm,postint}: Add set -e to scripts.
* d/rules: Just use dh_auto. No need to force using sub-directory as
  debhelper is doing it for us.

Modified: trunk/libapache-mod-jk/debian/changelog
===================================================================
--- trunk/libapache-mod-jk/debian/changelog	2012-02-05 21:26:55 UTC (rev 15762)
+++ trunk/libapache-mod-jk/debian/changelog	2012-02-05 23:36:49 UTC (rev 15763)
@@ -1,3 +1,11 @@
+libapache-mod-jk (1:1.2.32-3) UNRELEASED; urgency=low
+
+  * d/*.{prerm,postint}: Add set -e to scripts.
+  * d/rules: Just use dh_auto. No need to force using sub-directory as
+    debhelper is doing it for us.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 06 Feb 2012 00:35:59 +0100
+
 libapache-mod-jk (1:1.2.32-2) unstable; urgency=low
 
   * Team upload.

Modified: trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst	2012-02-05 21:26:55 UTC (rev 15762)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst	2012-02-05 23:36:49 UTC (rev 15763)
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 #DEBHELPER#
 

Modified: trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm	2012-02-05 21:26:55 UTC (rev 15762)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm	2012-02-05 23:36:49 UTC (rev 15763)
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 #DEBHELPER#
 

Modified: trunk/libapache-mod-jk/debian/rules
===================================================================
--- trunk/libapache-mod-jk/debian/rules	2012-02-05 21:26:55 UTC (rev 15762)
+++ trunk/libapache-mod-jk/debian/rules	2012-02-05 23:36:49 UTC (rev 15763)
@@ -7,11 +7,11 @@
 	dh $@ --with autotools_dev --sourcedirectory=native
 
 override_dh_auto_configure:
-	cd native && ./configure --with-apxs=/usr/bin/apxs2
+	dh_auto_configure -- --with-apxs=/usr/bin/apxs2
 	sed -i -e 's/^LIBTOOL = .*$$/LIBTOOL = \/bin\/sh ..\/libtool/' native/common/Makefile
 
 override_dh_auto_build:
-	$(MAKE) -C native
+	dh_auto_build
 	cp conf/httpd-jk.conf conf/jk.conf
 
 override_dh_auto_clean: