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 3b5a381736893bed3be9a1d8c68f7983e29a4faa Author: Damien Raude-Morvan <[email protected]> Date: Sat Jun 1 13:16:39 2013 +0000 * Re-enable Apache 2.4 transition after wheezy release (Closes: #666851): - d/control: Add Build-Depends apache2-dev and dh-apache2. - d/rules: Call apache2 dh addon. - d/libapache2-mod-jk.{postinst,postrm}: Replace with d/libapache2-mod-jk.apache2. - d/control: Remove explicit Depends on apache2.2-common. --- debian/changelog | 11 +++++++++++ debian/control | 5 +++-- debian/libapache2-mod-jk.apache2 | 2 ++ debian/libapache2-mod-jk.postinst | 24 ------------------------ debian/libapache2-mod-jk.prerm | 22 ---------------------- debian/rules | 2 +- 6 files changed, 17 insertions(+), 49 deletions(-) diff --git a/debian/changelog b/debian/changelog index b089f3d..de22744 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libapache-mod-jk (1:1.2.37-2) UNRELEASED; urgency=low + + * Re-enable Apache 2.4 transition after wheezy release (Closes: #666851): + - d/control: Add Build-Depends apache2-dev and dh-apache2. + - d/rules: Call apache2 dh addon. + - d/libapache2-mod-jk.{postinst,postrm}: Replace with + d/libapache2-mod-jk.apache2. + - d/control: Remove explicit Depends on apache2.2-common. + + -- Damien Raude-Morvan <[email protected]> Sat, 01 Jun 2013 15:14:00 +0200 + libapache-mod-jk (1:1.2.37-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 397575b..d670c05 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,10 @@ Section: httpd Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Damien Raude-Morvan <[email protected]> -Build-Depends: apache2-threaded-dev, +Build-Depends: apache2-dev, autotools-dev, debhelper (>= 8.1.3~), + dh-apache2, libtool Build-Depends-Indep: lynx, xsltproc Standards-Version: 3.9.3 @@ -15,7 +16,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libapache-mod-jk/ Package: libapache2-mod-jk Architecture: any -Depends: apache2.2-common, ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Suggests: libapache-mod-jk-doc, tomcat6 Conflicts: libapache2-mod-jk2 Replaces: libapache2-mod-jk2 diff --git a/debian/libapache2-mod-jk.apache2 b/debian/libapache2-mod-jk.apache2 new file mode 100644 index 0000000..ed1996e --- /dev/null +++ b/debian/libapache2-mod-jk.apache2 @@ -0,0 +1,2 @@ +mod native/apache-2.0/mod_jk.so +mod debian/jk.load diff --git a/debian/libapache2-mod-jk.postinst b/debian/libapache2-mod-jk.postinst deleted file mode 100644 index c2d5bc9..0000000 --- a/debian/libapache2-mod-jk.postinst +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -set -e - -#DEBHELPER# - -case "$1" in - configure) - - # Only activate jk if this is not an upgrade - if [ -z "$2" ]; then - a2enmod jk || true - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "$0 called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/libapache2-mod-jk.prerm b/debian/libapache2-mod-jk.prerm deleted file mode 100644 index 2f7c53b..0000000 --- a/debian/libapache2-mod-jk.prerm +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -set -e - -#DEBHELPER# - -case "$1" in - upgrade|failed-upgrade) - # Nothing to do here - ;; - - deconfigure|remove) - # Disable jk if this is not an upgrade - a2dismod jk || true - ;; - - *) - echo "$0 called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/rules b/debian/rules index b3e295d..b6e89fa 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ CFLAGS = -D_LARGEFILE_SUPPORT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $(shell dpkg-buildflags --get CFLAGS) %: - dh $@ --with autotools_dev --sourcedirectory=native + dh $@ --with autotools_dev,apache2 --sourcedirectory=native override_dh_auto_configure: dh_auto_configure -- --with-apxs=/usr/bin/apxs2 -- 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
