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 9594397123f3196197988e0dd049e86a631842e8 Author: Damien Raude-Morvan <[email protected]> Date: Sun Feb 5 23:36:49 2012 +0000 * 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. --- debian/changelog | 8 ++++++++ debian/libapache2-mod-jk.postinst | 3 ++- debian/libapache2-mod-jk.prerm | 3 ++- debian/rules | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd3d7d6..ea6639e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> Mon, 06 Feb 2012 00:35:59 +0100 + libapache-mod-jk (1:1.2.32-2) unstable; urgency=low * Team upload. diff --git a/debian/libapache2-mod-jk.postinst b/debian/libapache2-mod-jk.postinst index e3c6ba6..e746831 100644 --- a/debian/libapache2-mod-jk.postinst +++ b/debian/libapache2-mod-jk.postinst @@ -1,4 +1,5 @@ -#!/bin/sh -e +#!/bin/sh +set -e #DEBHELPER# diff --git a/debian/libapache2-mod-jk.prerm b/debian/libapache2-mod-jk.prerm index 4feb194..664b665 100644 --- a/debian/libapache2-mod-jk.prerm +++ b/debian/libapache2-mod-jk.prerm @@ -1,4 +1,5 @@ -#!/bin/sh -e +#!/bin/sh +set -e #DEBHELPER# diff --git a/debian/rules b/debian/rules index fd7d45e..b3e295d 100755 --- a/debian/rules +++ b/debian/rules @@ -7,11 +7,11 @@ CFLAGS = -D_LARGEFILE_SUPPORT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $(she 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: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libapache-mod-jk.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
