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 27f37e8fc46b9eef27e653193ac21e0d29947c55 Author: Michael Koch <[email protected]> Date: Sat Feb 17 16:22:12 2007 +0000 libapache-mod-jk (1:1.2.18-3) unstable; urgency=medium * debian/rules: copy source tree for native part to compile seperately for Apache 2.0 (Closes: #396224, #406636). * Added tomcat5.5 to Depends on tomcat4 | tomcat5 | tomcat5.5. * Updated Standards-Version to 3.7.2. * Added myself to Uploaders. --- debian/changelog | 10 ++++++++++ debian/control | 8 ++++---- debian/rules | 12 +++++++++--- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 92f811b..7eeebdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libapache-mod-jk (1:1.2.18-3) unstable; urgency=medium + + * debian/rules: copy source tree for native part to compile seperately for + Apache 2.0 (Closes: #396224, #406636). + * Added tomcat5.5 to Depends on tomcat4 | tomcat5 | tomcat5.5. + * Updated Standards-Version to 3.7.2. + * Added myself to Uploaders. + + -- Michael Koch <[email protected]> Sat, 17 Feb 2007 17:10:27 +0100 + libapache-mod-jk (1:1.2.18-2) unstable; urgency=low * debian/control (Depends): updated to apache2.2-common (closes: diff --git a/debian/control b/debian/control index 477a05e..c53747b 100644 --- a/debian/control +++ b/debian/control @@ -2,17 +2,17 @@ Source: libapache-mod-jk Section: web Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Stefan Gybas <[email protected]>, Wolfgang Baer <[email protected]>, Arnaud Vandyck <[email protected]> +Uploaders: Stefan Gybas <[email protected]>, Wolfgang Baer <[email protected]>, Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]> Build-Depends: debhelper (>= 4.2.30), dpatch, apache-dev (>= 1.3.33-1), apache2-threaded-dev, libtool Build-Depends-Indep: xsltproc, lynx -Standards-Version: 3.6.2 +Standards-Version: 3.7.2 Package: libapache-mod-jk Architecture: any Section: web Priority: optional Depends: ${shlibs:Depends}, apache-common (>= 1.3.33-1), apache | apache-perl | apache-ssl -Suggests: tomcat4 | tomcat5, libapache-mod-jk-doc +Suggests: tomcat4 | tomcat5 | tomcat5.5, libapache-mod-jk-doc Description: Apache 1.3 connector for the Tomcat Java servlet engine Apache Tomcat is the reference implementation for the Java Servlet and JavaServer Pages (JSP) specification from the Apache Jakarta project. @@ -29,7 +29,7 @@ Architecture: any Section: web Priority: optional Depends: ${shlibs:Depends}, apache2.2-common, apache2 -Suggests: tomcat4 | tomcat5, libapache-mod-jk-doc +Suggests: tomcat4 | tomcat5 | tomcat5.5, libapache-mod-jk-doc Conflicts: libapache2-mod-jk2 Replaces: libapache2-mod-jk2 Description: Apache 2 connector for the Tomcat Java servlet engine diff --git a/debian/rules b/debian/rules index 4947120..a3be7e2 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,9 @@ endif build: patch build-stamp build-stamp: dh_testdir + + cp -a native native-apache2 + touch build-stamp @@ -30,8 +33,9 @@ build-apache13: build-apache20: dh_testdir # -$(MAKE) -C native clean - cd native && ./configure --with-apxs=/usr/bin/apxs2 - $(MAKE) -C native + cd native-apache2 && ./configure --with-apxs=/usr/bin/apxs2 + sed -i -e 's/^LIBTOOL = .*$$/LIBTOOL = \/bin\/sh ..\/libtool/' native-apache2/common/Makefile + $(MAKE) -C native-apache2 build-doc: @@ -53,6 +57,7 @@ clean-patched: rm -f native/apache-1.3/Makefile native/apache-1.3/Makefile.apxs rm -f native/apache-2.0/Makefile native/apache-2.0/Makefile.apxs rm -f native/common/Makefile native/common/list.mk + rm -f native/common/jk_types.h rm -f native/jni/Makefile native/Makefile native/libtool rm -f native/config.status native/config.log rm -f native/apache-1.3/mod_jk.o @@ -64,6 +69,7 @@ clean-patched: rm -f native/common/*.lo native/common/*.o rm -rf native/apache-1.3/.libs native/common/.libs rm -rf native/apache-2.0/.libs native/common/.libs + rm -rf native-apache2 dh_clean @@ -84,7 +90,7 @@ install-arch: dh_clean -k -a dh_installdirs -a cp native/apache-1.3/mod_jk.so.0.0.0 debian/libapache-mod-jk/usr/lib/apache/1.3/mod_jk.so - cp native/apache-2.0/mod_jk.so debian/libapache2-mod-jk/usr/lib/apache2/modules/mod_jk.so + cp native-apache2/apache-2.0/mod_jk.so debian/libapache2-mod-jk/usr/lib/apache2/modules/mod_jk.so dh_install -a -- 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
