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 9eae0c641b7c9a3eab532381ed49c6bb6f58a352 Author: Michael Koch <[email protected]> Date: Wed Jul 11 22:56:01 2007 +0000 libapache-mod-jk (1:1.2.23-4) unstable; urgency=low * libapache2-mod-jk: Removed Suggests on tomcat4. * libapache-mod-jk-doc: Removed Suggests on libapache-mod-jk. -- Michael Koch <[email protected]> Thu, 5 Jul 2007 13:44:24 +0200 libapache-mod-jk (1:1.2.23-3) unstable; urgency=low * Don't build libapache-mod-jk binary package anymore. Closes: #429125. * Removed Wolfgang from Uploaders. -- Michael Koch <[email protected]> Sun, 24 Jun 2007 18:34:33 -0100 libapache-mod-jk (1:1.2.23-2) unstable; urgency=low * Point workers.tomcat_home to /usr/share/tomcat5 and workers.java_home to /usr/lib/jvm/java-gcj. * Generate changelog from changelog.html correctly. -- Michael Koch <[email protected]> Sat, 09 Jun 2007 16:06:13 -0100 --- debian/changelog | 22 ++++++++++++++++++++++ debian/control | 25 ++++--------------------- debian/rules | 17 ++--------------- debian/workers.properties | 4 ++-- 4 files changed, 30 insertions(+), 38 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5b2de77..d66f602 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +libapache-mod-jk (1:1.2.23-4) unstable; urgency=low + + * libapache2-mod-jk: Removed Suggests on tomcat4. + * libapache-mod-jk-doc: Removed Suggests on libapache-mod-jk. + + -- Michael Koch <[email protected]> Thu, 5 Jul 2007 13:44:24 +0200 + +libapache-mod-jk (1:1.2.23-3) unstable; urgency=low + + * Don't build libapache-mod-jk binary package anymore. Closes: #429125. + * Removed Wolfgang from Uploaders. + + -- Michael Koch <[email protected]> Sun, 24 Jun 2007 18:34:33 -0100 + +libapache-mod-jk (1:1.2.23-2) unstable; urgency=low + + * Point workers.tomcat_home to /usr/share/tomcat5 and + workers.java_home to /usr/lib/jvm/java-gcj. + * Generate changelog from changelog.html correctly. + + -- Michael Koch <[email protected]> Sat, 09 Jun 2007 16:06:13 -0100 + libapache-mod-jk (1:1.2.23-1) unstable; urgency=high * New upstream release. diff --git a/debian/control b/debian/control index c53747b..13fd245 100644 --- a/debian/control +++ b/debian/control @@ -2,34 +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]>, Michael Koch <[email protected]> -Build-Depends: debhelper (>= 4.2.30), dpatch, apache-dev (>= 1.3.33-1), apache2-threaded-dev, libtool +Uploaders: Stefan Gybas <[email protected]>, Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]> +Build-Depends: debhelper (>= 4.2.30), dpatch, apache2-threaded-dev, libtool Build-Depends-Indep: xsltproc, lynx 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 | 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. - . - This package contains an Apache 1.3 module (mod_jk) to forward requests - from Apache to Tomcat using the AJP 1.3 or 1.4 protocol. It can either - talk to Tomcat on the local machine or to a remote engine using TCP. - . - For more information about Tomcat please take a look at the home page at - http://jakarta.apache.org/tomcat/index.html. - Package: libapache2-mod-jk Architecture: any Section: web Priority: optional Depends: ${shlibs:Depends}, apache2.2-common, apache2 -Suggests: tomcat4 | tomcat5 | tomcat5.5, libapache-mod-jk-doc +Suggests: 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 @@ -47,7 +30,7 @@ Package: libapache-mod-jk-doc Architecture: all Section: doc Priority: optional -Suggests: libapache2-mod-jk | libapache-mod-jk +Suggests: libapache2-mod-jk Conflicts: libapache-mod-jk (<= 1.2.5-2) Replaces: libapache-mod-jk (<= 1.2.5-2) Description: Documentation of libapache-mod-jk/libapache2-mod-jk packages diff --git a/debian/rules b/debian/rules index a3be7e2..1b0e71f 100755 --- a/debian/rules +++ b/debian/rules @@ -23,13 +23,6 @@ build-stamp: touch build-stamp -build-apache13: - dh_testdir -# -$(MAKE) -C native clean - cd native && ./configure --with-apxs=/usr/bin/apxs - $(MAKE) -C native -# exit 1 - build-apache20: dh_testdir # -$(MAKE) -C native clean @@ -43,7 +36,7 @@ build-doc: cd build/docs && for i in `find . -name '*.xml'`; do xsltproc style.xsl $$i > `dirname $$i`/`basename $$i .xml`.html; done cd build/docs && find . -name '*.xml' -exec rm -f {} \; cd build/docs && rm -f style.xsl BUILDING - cd build/docs && lynx -dump -nolist changelog.html > changelog + cd build/docs/miscellaneous && lynx -dump -nolist changelog.html > ../changelog ## -------- CLEAN TARGETS @@ -54,20 +47,15 @@ clean-patched: rm -f build-stamp rm -f native/common/portable.h native/common/stamp-h1 rm -rf build - 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 - rm -f native/apache-1.3/mod_jk.la native/apache-1.3/mod_jk.lo - rm -f native/apache-1.3/mod_jk.a native/apache-1.3/mod_jk.so* rm -f native/apache-2.0/mod_jk.o rm -f native/apache-2.0/mod_jk.la native/apache-2.0/mod_jk.lo rm -f native/apache-2.0/mod_jk.a native/apache-2.0/mod_jk.so* 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 @@ -89,7 +77,6 @@ install-arch: dh_testroot 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-apache2/apache-2.0/mod_jk.so debian/libapache2-mod-jk/usr/lib/apache2/modules/mod_jk.so dh_install -a @@ -117,7 +104,7 @@ binary-indep: build-doc install-indep dh_builddeb -i # Build architecture-dependent files here. -binary-arch: build build-apache13 build-apache20 install-arch +binary-arch: build build-apache20 install-arch dh_testdir -a dh_testroot -a dh_installchangelogs -a diff --git a/debian/workers.properties b/debian/workers.properties index 56401e8..f2d29fb 100644 --- a/debian/workers.properties +++ b/debian/workers.properties @@ -32,13 +32,13 @@ # installed tomcat. This is where you have your conf, webapps and lib # directories. # -workers.tomcat_home=/usr/share/tomcat4 +workers.tomcat_home=/usr/share/tomcat5 # # workers.java_home should point to your Java installation. Normally # you should have a bin and lib directories beneath it. # -workers.java_home=/usr/lib/j2sdk1.4-sun +workers.java_home=/usr/lib/jvm/java-gcj # # You should configure your environment slash... ps=\ on NT and / on UNIX -- 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
