Author: drazzib
Date: 2012-05-18 17:21:19 +0000 (Fri, 18 May 2012)
New Revision: 16055
Added:
trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
Modified:
trunk/libapache-mod-jk/debian/changelog
trunk/libapache-mod-jk/debian/control
trunk/libapache-mod-jk/debian/copyright
trunk/libapache-mod-jk/debian/libapache2-mod-jk.install
trunk/libapache-mod-jk/debian/rules
Log:
Revert Apache 2.4 transition.
Modified: trunk/libapache-mod-jk/debian/changelog
===================================================================
--- trunk/libapache-mod-jk/debian/changelog 2012-05-18 04:56:41 UTC (rev
16054)
+++ trunk/libapache-mod-jk/debian/changelog 2012-05-18 17:21:19 UTC (rev
16055)
@@ -1,3 +1,9 @@
+libapache-mod-jk (1:1.2.35-2) UNRELEASED; urgency=low
+
+ * Revert Apache 2.4 transition.
+
+ -- Damien Raude-Morvan <draz...@debian.org> Fri, 18 May 2012 19:20:50 +0200
+
libapache-mod-jk (1:1.2.35-1) experimental; urgency=low
* New upstream release:
Modified: trunk/libapache-mod-jk/debian/control
===================================================================
--- trunk/libapache-mod-jk/debian/control 2012-05-18 04:56:41 UTC (rev
16054)
+++ trunk/libapache-mod-jk/debian/control 2012-05-18 17:21:19 UTC (rev
16055)
@@ -3,10 +3,9 @@
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <draz...@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 @@
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
Modified: trunk/libapache-mod-jk/debian/copyright
===================================================================
--- trunk/libapache-mod-jk/debian/copyright 2012-05-18 04:56:41 UTC (rev
16054)
+++ trunk/libapache-mod-jk/debian/copyright 2012-05-18 17:21:19 UTC (rev
16055)
@@ -16,4 +16,3 @@
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.
-
Modified: trunk/libapache-mod-jk/debian/libapache2-mod-jk.install
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.install 2012-05-18
04:56:41 UTC (rev 16054)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.install 2012-05-18
17:21:19 UTC (rev 16055)
@@ -1,4 +1,4 @@
+conf/jk.conf /etc/apache2/mods-available/
+debian/jk.load /etc/apache2/mods-available/
debian/workers.properties /etc/libapache2-mod-jk/
-debian/jk.load /etc/apache2/mods-available/
-conf/jk.conf /etc/apache2/mods-available/
native/apache-2.0/mod_jk.so /usr/lib/apache2/modules/
Added: trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
(rev 0)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst 2012-05-18
17:21:19 UTC (rev 16055)
@@ -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
Added: trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
(rev 0)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm 2012-05-18
17:21:19 UTC (rev 16055)
@@ -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
Modified: trunk/libapache-mod-jk/debian/rules
===================================================================
--- trunk/libapache-mod-jk/debian/rules 2012-05-18 04:56:41 UTC (rev 16054)
+++ trunk/libapache-mod-jk/debian/rules 2012-05-18 17:21:19 UTC (rev 16055)
@@ -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
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
