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 1b103934d90ce6b5a035ac33aed7c4d8e16d142d Author: Wolfgang Bär <[email protected]> Date: Mon Oct 3 16:36:16 2005 +0000 libapache-mod-jk (1:1.2.14.1-1+2) unstable; urgency=low * New upstream release (closes: #307331) * Removed cdbs dependency - building only with debhelper * Build Apache2 package (closes: #296345) * Split documentation in own package so it does not ship twice * Updated workers.properties * Added example httpd.conf files for Apache 1.3 and 2 * Added tomcat5 as alternative to tomcat4 to suggests * Only provide example conf files (for Apache1.3/2) which have to be installed and modified for a specific setup by the user (closes: #321203) * Added conflicts/replaces with libapache2-mod-jk2 and added NEWS.Debian * Registered documentation with doc-base * Updated copyright to new upstream Apache License Version 2.0 --- debian/NEWS | 9 ------ debian/changelog | 19 +++++++++++-- debian/control | 15 ++++++---- debian/httpd_example_apache.conf | 2 +- debian/httpd_example_apache2.conf | 2 +- debian/libapache-mod-jk-doc.doc-base | 12 ++++++++ debian/libapache-mod-jk-doc.lintian | 1 + debian/libapache-mod-jk.dirs | 1 - debian/libapache2-mod-jk.NEWS | 11 ++++++++ debian/libapache2-mod-jk.dirs | 2 +- debian/rules | 54 ++++++++++++++++++++---------------- 11 files changed, 83 insertions(+), 45 deletions(-) diff --git a/debian/NEWS b/debian/NEWS deleted file mode 100644 index d9705b4..0000000 --- a/debian/NEWS +++ /dev/null @@ -1,9 +0,0 @@ -libapache-mod-jk (1:1.2.13-1) unstable; urgency=low - - An Apache 2 package is provided (libapache2-mod-jk) and should - be used instead of the deprecated libapache2-mod-jk2 package. - - Due to building packages for Apache 1.3 and 2 the documentation - is now packaged seperately (libapache-mod-jk-doc). - - -- Wolfgang Baer <[email protected]> Thu, 23 Jun 2005 22:42:54 +0200 diff --git a/debian/changelog b/debian/changelog index 7e2baa2..2261640 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -libapache-mod-jk (1:1.2.13-1) unstable; urgency=low +libapache-mod-jk (1:1.2.14.1-2) unstable; urgency=low + + * Fixed binary arch only build by splitting + arch and indep install targets + + -- Wolfgang Baer <[email protected]> Mon, 03 Oct 2005 13:25:14 +0200 + +libapache-mod-jk (1:1.2.14.1-1) unstable; urgency=low * New upstream release (closes: #307331) * Removed cdbs dependency - building only with debhelper @@ -8,13 +15,19 @@ libapache-mod-jk (1:1.2.13-1) unstable; urgency=low * Split documentation in own package so it does not ship twice + debian/control: package libapache-mod-jk-doc added + debian/control: xsltproc dependency for building + + debian/control: added conflicts/replaces with old libapache-mod-jk * Updated workers.properties * Added example httpd.conf files for Apache 1.3 and 2 - * Added coming tomcat5 as alternative to tomcat4 to suggests + * Added tomcat5 as alternative to tomcat4 to suggests + * Only provide example conf files (for Apache1.3/2) which have to be + installed and modified for a specific setup by the user (closes: #321203) + * Added conflicts/replaces with libapache2-mod-jk2 and added NEWS.Debian + * Registered documentation with doc-base + * Added lintian override for changelog html file used in the manual * Updated copyright to new upstream Apache License Version 2.0 * Updated Standards-Version to 3.6.2 - no changes - -- Wolfgang Baer <[email protected]> Thu, 23 Jun 2005 22:42:54 +0200 + -- Wolfgang Baer <[email protected]> Tue, 6 Sep 2005 14:43:49 +0200 libapache-mod-jk (1:1.2.5-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 8692655..adc8cc9 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,15 @@ Section: web Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Stefan Gybas <[email protected]>, Wolfgang Baer <[email protected]> -Build-Depends: debhelper (>= 4.1.0), dpatch, apache-dev (>= 1.3.29.0.1), apache2-threaded-dev, libtool -Build-Depends-Indep: xsltproc +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 Package: libapache-mod-jk Architecture: any Section: web Priority: optional -Depends: ${shlibs:Depends}, apache-common (>= 1.3.29.0.1), apache | apache-perl | apache-ssl +Depends: ${shlibs:Depends}, apache-common (>= 1.3.33-1), apache | apache-perl | apache-ssl Suggests: tomcat4 | tomcat5, 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 @@ -30,6 +30,8 @@ Section: web Priority: optional Depends: ${shlibs:Depends}, apache2-common, apache2 Suggests: tomcat4 | tomcat5, libapache-mod-jk-doc +Conflicts: libapache2-mod-jk2 +Replaces: libapache2-mod-jk2 Description: Apache 2 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. @@ -45,9 +47,12 @@ Package: libapache-mod-jk-doc Architecture: all Section: doc Priority: optional -Description: Documentation and examples of libapache-mod-jk packages +Suggests: libapache2-mod-jk | libapache-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 Documentation and examples of the Apache jk connector for the Tomcat - Java servlet engine + Java servlet engine. . For uptodate documentation about Tomcat connectors please take a look at the home page at http://jakarta.apache.org/tomcat/connectors-doc. diff --git a/debian/httpd_example_apache.conf b/debian/httpd_example_apache.conf index 22392d6..57ccd56 100644 --- a/debian/httpd_example_apache.conf +++ b/debian/httpd_example_apache.conf @@ -2,7 +2,7 @@ # for Apache 1.3 # # for all commands/options available see the manual -# the provided in libapache-mod-jk-doc package. +# provided in libapache-mod-jk-doc package. # The location where mod_jk will find the workers definitions JkWorkersFile /etc/libapache-mod-jk/workers.properties diff --git a/debian/httpd_example_apache2.conf b/debian/httpd_example_apache2.conf index 47576f4..03ace69 100644 --- a/debian/httpd_example_apache2.conf +++ b/debian/httpd_example_apache2.conf @@ -2,7 +2,7 @@ # for Apache 2 # # for all commands/options available see the manual -# the provided in libapache-mod-jk-doc package. +# provided in libapache-mod-jk-doc package. # The location where mod_jk will find the workers definitions JkWorkersFile /etc/libapache2-mod-jk/workers.properties diff --git a/debian/libapache-mod-jk-doc.doc-base b/debian/libapache-mod-jk-doc.doc-base new file mode 100644 index 0000000..08fdd0e --- /dev/null +++ b/debian/libapache-mod-jk-doc.doc-base @@ -0,0 +1,12 @@ +Document: libapache-mod-jk-doc +Title: The Apache Jakarta Tomcat Connector +Author: The Apache Jakarta team +Abstract: This manual contains general documentation and configuration + information of the Apache Tomcat connector for Apache 1.3 and 2.0 +Section: Web + +Format: HTML +Index: /usr/share/doc/libapache-mod-jk-doc/index.html +Files: /usr/share/doc/libapache-mod-jk-doc/*.html + + diff --git a/debian/libapache-mod-jk-doc.lintian b/debian/libapache-mod-jk-doc.lintian new file mode 100644 index 0000000..e4051a9 --- /dev/null +++ b/debian/libapache-mod-jk-doc.lintian @@ -0,0 +1 @@ +libapache-mod-jk-doc: changelog-file-not-compressed diff --git a/debian/libapache-mod-jk.dirs b/debian/libapache-mod-jk.dirs index 21c179f..7bb4328 100644 --- a/debian/libapache-mod-jk.dirs +++ b/debian/libapache-mod-jk.dirs @@ -1,3 +1,2 @@ usr/lib/apache/1.3/ etc/libapache-mod-jk/ - diff --git a/debian/libapache2-mod-jk.NEWS b/debian/libapache2-mod-jk.NEWS new file mode 100644 index 0000000..fc7d24e --- /dev/null +++ b/debian/libapache2-mod-jk.NEWS @@ -0,0 +1,11 @@ +libapache2-mod-jk (1:1.2.14.1-1) unstable; urgency=low + + This package replaces the previously libapache2-mod-jk2 package + which is now unsupported upstream and therefore removed from + the archive. + + Its recommended to switch to this package. Due to building packages + for Apache 1.3 and 2 the documentation is now packaged seperately + (libapache-mod-jk-doc). + + -- Wolfgang Baer <[email protected]> Thu, 23 Jun 2005 22:42:54 +0200 diff --git a/debian/libapache2-mod-jk.dirs b/debian/libapache2-mod-jk.dirs index f2f8ecf..7118833 100644 --- a/debian/libapache2-mod-jk.dirs +++ b/debian/libapache2-mod-jk.dirs @@ -1,3 +1,3 @@ +usr/lib/apache2/modules/ etc/libapache2-mod-jk/ etc/apache2/mods-available/ - diff --git a/debian/rules b/debian/rules index 2c7cbfd..320cebd 100755 --- a/debian/rules +++ b/debian/rules @@ -15,38 +15,31 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) endif build: patch build-stamp - build-stamp: dh_testdir touch build-stamp + build-apache13: dh_testdir -$(MAKE) -C jk/native clean cd jk/native && ./configure --with-apxs=/usr/bin/apxs - make -C jk/native + $(MAKE) -C jk/native build-apache20: dh_testdir -$(MAKE) -C jk/native clean cd jk/native && ./configure --with-apxs=/usr/bin/apxs2 - make -C jk/native + $(MAKE) -C jk/native + build-doc: cd jk/xdocs && install -d ../build/docs/ && cp -R * ../build/docs/ cd jk/build/docs && for i in `find . -name '*.xml'`; do xsltproc style.xsl $$i > `dirname $$i`/`basename $$i .xml`.html; done cd jk/build/docs && find . -name '*.xml' -exec rm -f {} \; - cd jk/build/docs && rm -f style.xsl - - -## -------- INSTALL TARGETS -apache13: build-apache13 - mkdir -p $(CURDIR)/debian/libapache-mod-jk/usr/lib/apache/1.3/ - cp jk/native/apache-1.3/mod_jk.so.0.0.0 debian/libapache-mod-jk/usr/lib/apache/1.3/mod_jk.so + cd jk/build/docs && rm -f style.xsl BUILDING + cd jk/build/docs && lynx -dump -nolist changelog.html > changelog -apache20: build-apache20 - mkdir -p $(CURDIR)/debian/libapache2-mod-jk/usr/lib/apache2/modules/ - cp jk/native/apache-2.0/mod_jk.so debian/libapache2-mod-jk/usr/lib/apache2/modules/mod_jk.so ## -------- CLEAN TARGETS clean: clean-patched unpatch @@ -70,17 +63,29 @@ clean-patched: rm -f jk/native/common/*.lo jk/native/common/*.o rm -rf jk/native/apache-1.3/.libs jk/native/common/.libs rm -rf jk/native/apache-2.0/.libs jk/native/common/.libs - dh_clean -k + dh_clean -## -------- INSTALL TARGETS -install: install-stamp -install-stamp: +install: install-indep install-arch +install-indep: + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + # install lintian overrides as we have a changelog.html used in the manual + install -d $(CURDIR)/debian/libapache-mod-jk-doc/usr/share/lintian/overrides/ + install -m 644 $(CURDIR)/debian/libapache-mod-jk-doc.lintian $(CURDIR)/debian/libapache-mod-jk-doc/usr/share/lintian/overrides/libapache-mod-jk-doc + dh_install -i + +install-arch: dh_testdir dh_testroot - dh_clean -k - dh_installdirs - dh_install + dh_clean -k -a + dh_installdirs -a + cp jk/native/apache-1.3/mod_jk.so.0.0.0 debian/libapache-mod-jk/usr/lib/apache/1.3/mod_jk.so + cp jk/native/apache-2.0/mod_jk.so debian/libapache2-mod-jk/usr/lib/apache2/modules/mod_jk.so + dh_install -a + patch: patch-stamp patch-stamp: @@ -93,9 +98,10 @@ unpatch: # Build architecture-independent files here. -binary-indep: build build-doc install +binary-indep: build-doc install-indep dh_testdir -i dh_testroot -i + dh_installchangelogs -i dh_installexamples -i dh_installdocs -i dh_compress -i -Xchangelog.html @@ -105,7 +111,7 @@ binary-indep: build build-doc install dh_builddeb -i # Build architecture-dependent files here. -binary-arch: apache13 apache20 install +binary-arch: build build-apache13 build-apache20 install-arch dh_testdir -a dh_testroot -a dh_installchangelogs -a @@ -120,5 +126,5 @@ binary-arch: apache13 apache20 install dh_md5sums -a dh_builddeb -a -binary: binary-indep binary-arch -.PHONY: binary-indep build-doc binary-arch build-apache13 build-apache20 binary install +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch -- 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
