[libapache-mod-jk] 36/65: Revert Apache 2.4 transition.

[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 5072ecab600b584347a0484db92aa42a056f5738
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Fri May 18 17:21:19 2012 +0000

    Revert Apache 2.4 transition.
---
 debian/changelog                  |  6 ++++++
 debian/control                    |  5 ++---
 debian/copyright                  |  1 -
 debian/libapache2-mod-jk.install  |  4 ++--
 debian/libapache2-mod-jk.postinst | 24 ++++++++++++++++++++++++
 debian/libapache2-mod-jk.prerm    | 22 ++++++++++++++++++++++
 debian/rules                      |  2 +-
 7 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 000892f..852c5e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libapache-mod-jk (1:1.2.35-2) UNRELEASED; urgency=low
+
+  * Revert Apache 2.4 transition.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 18 May 2012 19:20:50 +0200
+
 libapache-mod-jk (1:1.2.35-1) experimental; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index d670c05..397575b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,9 @@ Section: httpd
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: apache2-dev,
+Build-Depends: apache2-threaded-dev,
                autotools-dev,
                debhelper (>= 8.1.3~),
-               dh-apache2,
                libtool
 Build-Depends-Indep: lynx, xsltproc
 Standards-Version: 3.9.3
@@ -16,7 +15,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libapache-mod-jk/
 
 Package: libapache2-mod-jk
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: apache2.2-common, ${misc:Depends}, ${shlibs:Depends}
 Suggests: libapache-mod-jk-doc, tomcat6
 Conflicts: libapache2-mod-jk2
 Replaces: libapache2-mod-jk2
diff --git a/debian/copyright b/debian/copyright
index 9f51505..c26ee7a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,4 +16,3 @@ License: Apache-2.0
 License: Apache-2.0
   A complete copy of the Apache License, Version 2.0, can be found in
   /usr/share/common-licenses/Apache-2.0 on Debian Systems.
-
diff --git a/debian/libapache2-mod-jk.install b/debian/libapache2-mod-jk.install
index 5fcd5d3..e982abe 100644
--- a/debian/libapache2-mod-jk.install
+++ b/debian/libapache2-mod-jk.install
@@ -1,4 +1,4 @@
-debian/workers.properties	/etc/libapache2-mod-jk/
-debian/jk.load 			/etc/apache2/mods-available/
 conf/jk.conf			/etc/apache2/mods-available/
+debian/jk.load 			/etc/apache2/mods-available/
+debian/workers.properties	/etc/libapache2-mod-jk/
 native/apache-2.0/mod_jk.so	/usr/lib/apache2/modules/
diff --git a/debian/libapache2-mod-jk.postinst b/debian/libapache2-mod-jk.postinst
new file mode 100644
index 0000000..c2d5bc9
--- /dev/null
+++ b/debian/libapache2-mod-jk.postinst
@@ -0,0 +1,24 @@
+#!/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
new file mode 100644
index 0000000..2f7c53b
--- /dev/null
+++ b/debian/libapache2-mod-jk.prerm
@@ -0,0 +1,22 @@
+#!/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 b6e89fa..b3e295d 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,apache2 --sourcedirectory=native
+	dh $@ --with autotools_dev --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