[pkg-java] r15892 - in trunk/libapache-mod-jk/debian: . patches

Damien Raude-Morvan drazzib at alioth.debian.org
Wed Apr 4 20:34:10 UTC 2012 

Author: drazzib
Date: 2012-04-04 20:34:09 +0000 (Wed, 04 Apr 2012)
New Revision: 15892

Added:
   trunk/libapache-mod-jk/debian/libapache2-mod-jk.apache2
Removed:
   trunk/libapache-mod-jk/debian/libapache2-mod-jk.dirs
   trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
   trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm
   trunk/libapache-mod-jk/debian/patches/0004-compiler-hardening.patch
Modified:
   trunk/libapache-mod-jk/debian/changelog
   trunk/libapache-mod-jk/debian/control
   trunk/libapache-mod-jk/debian/copyright
   trunk/libapache-mod-jk/debian/patches/series
   trunk/libapache-mod-jk/debian/rules
Log:
* New upstream release:
  - d/patches/0004-compiler-hardening.patch: Merged upstream.
* Prepare Apache 2.4 transition (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.
* d/control: Bump Standards-Version to 3.9.3, no changes needed.
* d/copyright: Upgrade to copyright-format 1.0.

Modified: trunk/libapache-mod-jk/debian/changelog
===================================================================
--- trunk/libapache-mod-jk/debian/changelog	2012-04-04 20:32:15 UTC (rev 15891)
+++ trunk/libapache-mod-jk/debian/changelog	2012-04-04 20:34:09 UTC (rev 15892)
@@ -1,10 +1,19 @@
-libapache-mod-jk (1:1.2.32-3) UNRELEASED; urgency=low
+libapache-mod-jk (1:1.2.35-1) experimental; urgency=low
 
-  * d/*.{prerm,postint}: Add set -e to scripts.
+  * New upstream release:
+    - d/patches/0004-compiler-hardening.patch: Merged upstream.
   * d/rules: Just use dh_auto. No need to force using sub-directory as
     debhelper is doing it for us.
+  * Prepare Apache 2.4 transition (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.
+  * d/control: Bump Standards-Version to 3.9.3, no changes needed.
+  * d/copyright: Upgrade to copyright-format 1.0.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 06 Feb 2012 00:35:59 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 04 Apr 2012 22:32:12 +0200
 
 libapache-mod-jk (1:1.2.32-2) unstable; urgency=low
 

Modified: trunk/libapache-mod-jk/debian/control
===================================================================
--- trunk/libapache-mod-jk/debian/control	2012-04-04 20:32:15 UTC (rev 15891)
+++ trunk/libapache-mod-jk/debian/control	2012-04-04 20:34:09 UTC (rev 15892)
@@ -3,17 +3,21 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 8.1.3~), apache2-threaded-dev, libtool, autotools-dev
-Build-Depends-Indep: xsltproc, lynx
-Standards-Version: 3.9.2
+Build-Depends: apache2-dev,
+               autotools-dev,
+               debhelper (>= 8.1.3~),
+               dh-apache2,
+               libtool
+Build-Depends-Indep: lynx, xsltproc
+Standards-Version: 3.9.3
 Homepage: http://tomcat.apache.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libapache-mod-jk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libapache-mod-jk/
 
 Package: libapache2-mod-jk
 Architecture: any
-Depends: ${shlibs:Depends}, apache2.2-common, apache2, ${misc:Depends}
-Suggests: tomcat6, libapache-mod-jk-doc
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Suggests: libapache-mod-jk-doc, tomcat6
 Conflicts: libapache2-mod-jk2
 Replaces: libapache2-mod-jk2
 Description: Apache 2 connector for the Tomcat Java servlet engine
@@ -32,7 +36,7 @@
 Conflicts: libapache-mod-jk (<= 1.2.5-2)
 Replaces: libapache-mod-jk (<= 1.2.5-2)
 Description: Documentation of libapache2-mod-jk package
- Documentation and examples of the Apache jk connector for the Tomcat 
+ Documentation and examples of the Apache jk connector for the Tomcat
  Java servlet engine.
  .
  For uptodate documentation about Tomcat connectors please take a look

Modified: trunk/libapache-mod-jk/debian/copyright
===================================================================
--- trunk/libapache-mod-jk/debian/copyright	2012-04-04 20:32:15 UTC (rev 15891)
+++ trunk/libapache-mod-jk/debian/copyright	2012-04-04 20:34:09 UTC (rev 15892)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache Tomcat JK Connector
 Upstream-Contact: <http://tomcat.apache.org/connectors-doc/>
 Source: http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/
@@ -9,10 +9,11 @@
 
 Files: debian/*
 Copyright: 2003, Stefan Gybas <sgybas at debian.org>
-Copyright: 2009, Michael Koch <konqueror at gmx.de>
-Copyright: 2011, Damien Raude-Morvan <drazzib at debian.org>
+ 2009, Michael Koch <konqueror at gmx.de>
+ 2011, Damien Raude-Morvan <drazzib at debian.org>
 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.
+

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	2012-04-04 20:34:09 UTC (rev 15892)
@@ -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.dirs
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.dirs	2012-04-04 20:32:15 UTC (rev 15891)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.dirs	2012-04-04 20:34:09 UTC (rev 15892)
@@ -1,3 +0,0 @@
-usr/lib/apache2/modules/
-etc/libapache2-mod-jk/
-etc/apache2/mods-available/

Deleted: trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst	2012-04-04 20:32:15 UTC (rev 15891)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.postinst	2012-04-04 20:34:09 UTC (rev 15892)
@@ -1,25 +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	2012-04-04 20:32:15 UTC (rev 15891)
+++ trunk/libapache-mod-jk/debian/libapache2-mod-jk.prerm	2012-04-04 20:34:09 UTC (rev 15892)
@@ -1,23 +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
-

Deleted: trunk/libapache-mod-jk/debian/patches/0004-compiler-hardening.patch
===================================================================
--- trunk/libapache-mod-jk/debian/patches/0004-compiler-hardening.patch	2012-04-04 20:32:15 UTC (rev 15891)
+++ trunk/libapache-mod-jk/debian/patches/0004-compiler-hardening.patch	2012-04-04 20:34:09 UTC (rev 15892)
@@ -1,27 +0,0 @@
-Author: tony mancill <tmancill at debian.org>
-Last-Update: 2012-02-03 
-Description: patch for "error: format not a string literal and no format arguments [-Werror=format-security]" 
-Bug-vendor: https://issues.apache.org/bugzilla/show_bug.cgi?id=52564
-Forwarded: yes
---- a/native/apache-2.0/mod_jk.c.orig	2012-02-04 05:51:31.000000000 +0000
-+++ b/native/apache-2.0/mod_jk.c	2012-02-04 06:42:01.018105253 +0000
-@@ -673,15 +673,15 @@
-     }
- 
- #if (MODULE_MAGIC_NUMBER_MAJOR >= 20100606)
--    ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, s, res);
-+    ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, s, "%s", res);
- #else
--    ap_log_error(file, line, level, 0, s, res);
-+    ap_log_error(file, line, level, 0, s, "%s", res);
- #endif
-     if ( s ) {
- #if (MODULE_MAGIC_NUMBER_MAJOR >= 20100606)
--        ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, NULL, res);
-+        ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, NULL, "%s", res);
- #else
--        ap_log_error(file, line, level, 0, NULL, res);
-+        ap_log_error(file, line, level, 0, NULL, "%s", res);
- #endif
-     }
- 

Modified: trunk/libapache-mod-jk/debian/patches/series
===================================================================
--- trunk/libapache-mod-jk/debian/patches/series	2012-04-04 20:32:15 UTC (rev 15891)
+++ trunk/libapache-mod-jk/debian/patches/series	2012-04-04 20:34:09 UTC (rev 15892)
@@ -1,4 +1,3 @@
 0001-disable-logo.patch
 0002-debianize-log-directory.patch
 0003-upgrade-info-to-error-message.patch
-0004-compiler-hardening.patch

Modified: trunk/libapache-mod-jk/debian/rules
===================================================================
--- trunk/libapache-mod-jk/debian/rules	2012-04-04 20:32:15 UTC (rev 15891)
+++ trunk/libapache-mod-jk/debian/rules	2012-04-04 20:34:09 UTC (rev 15892)
@@ -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

More information about the pkg-java-commits mailing list