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

[Damien Raude-Morvan]

Author: drazzib
Date: 2013-06-01 13:16:39 +0000 (Sat, 01 Jun 2013)
New Revision: 16801

Added:
   trunk/libapache-mod-jk/debian/libapache2-mod-jk.apache2
Removed:
   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/rules
Log:
* 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.

Modified: trunk/libapache-mod-jk/debian/changelog
===================================================================
--- trunk/libapache-mod-jk/debian/changelog	2013-05-31 22:32:33 UTC (rev 16800)
+++ trunk/libapache-mod-jk/debian/changelog	2013-06-01 13:16:39 UTC (rev 16801)
@@ -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 <drazzib at debian.org>  Sat, 01 Jun 2013 15:14:00 +0200
+
 libapache-mod-jk (1:1.2.37-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libapache-mod-jk/debian/control
===================================================================
--- trunk/libapache-mod-jk/debian/control	2013-05-31 22:32:33 UTC (rev 16800)
+++ trunk/libapache-mod-jk/debian/control	2013-06-01 13:16:39 UTC (rev 16801)
@@ -3,9 +3,10 @@
 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-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 @@
 
 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

Added: trunk/libapache-mod-jk/debian/libapache2-mod-jk.apache2
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.apache2	                        (rev 0)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.apache2	2013-06-01 13:16:39 UTC (rev 16801)
@@ -0,0 +1,2 @@
+mod native/apache-2.0/mod_jk.so
+mod debian/jk.load

Deleted: trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst	2013-05-31 22:32:33 UTC (rev 16800)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst	2013-06-01 13:16:39 UTC (rev 16801)
@@ -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

Deleted: trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm	2013-05-31 22:32:33 UTC (rev 16800)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm	2013-06-01 13:16:39 UTC (rev 16801)
@@ -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

Modified: trunk/libapache-mod-jk/debian/rules
===================================================================
--- trunk/libapache-mod-jk/debian/rules	2013-05-31 22:32:33 UTC (rev 16800)
+++ trunk/libapache-mod-jk/debian/rules	2013-06-01 13:16:39 UTC (rev 16801)
@@ -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