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 d1e4b074f1ef5401552e5ee612e00ed15b272ca2 Author: Arnaud Vandyck <[email protected]> Date: Wed Aug 2 22:21:48 2006 +0000 libapache-mod-jk (1:1.2.18-1) unstable; urgency=low * New upstream * debian/watch: added * Added myself to uploaders * debian/rules: modified to revert changes in upstream structure (jk directory does not exist anymore) -- Arnaud Vandyck <[email protected]> Wed, 2 Aug 2006 11:11:03 +0200 --- debian/changelog | 10 ++++++ debian/control | 2 +- debian/libapache-mod-jk-doc.docs | 2 +- debian/libapache-mod-jk-doc.examples | 6 ++-- debian/patches/00list | 2 +- debian/patches/02_style_xsl.dpatch | 30 +++++++++++++++++ debian/rules | 62 ++++++++++++++++++------------------ debian/watch | 2 ++ 8 files changed, 79 insertions(+), 37 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2261640..b61ad68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libapache-mod-jk (1:1.2.18-1) unstable; urgency=low + + * New upstream + * debian/watch: added + * Added myself to uploaders + * debian/rules: modified to revert changes in upstream structure (jk + directory does not exist anymore) + + -- Arnaud Vandyck <[email protected]> Wed, 2 Aug 2006 11:11:03 +0200 + libapache-mod-jk (1:1.2.14.1-2) unstable; urgency=low * Fixed binary arch only build by splitting diff --git a/debian/control b/debian/control index adc8cc9..640e94c 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libapache-mod-jk Section: web Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Stefan Gybas <[email protected]>, Wolfgang Baer <[email protected]> +Uploaders: Stefan Gybas <[email protected]>, Wolfgang Baer <[email protected]>, Arnaud Vandyck <[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 diff --git a/debian/libapache-mod-jk-doc.docs b/debian/libapache-mod-jk-doc.docs index 7d94751..a401422 100644 --- a/debian/libapache-mod-jk-doc.docs +++ b/debian/libapache-mod-jk-doc.docs @@ -1 +1 @@ -jk/build/docs/* +build/docs/* diff --git a/debian/libapache-mod-jk-doc.examples b/debian/libapache-mod-jk-doc.examples index aab5bfc..3f150ce 100644 --- a/debian/libapache-mod-jk-doc.examples +++ b/debian/libapache-mod-jk-doc.examples @@ -1,3 +1,3 @@ -jk/tools/reports/README.txt -jk/tools/reports/tomcat_reports.pl -jk/tools/reports/tomcat_trend.pl +tools/reports/README.txt +tools/reports/tomcat_reports.pl +tools/reports/tomcat_trend.pl diff --git a/debian/patches/00list b/debian/patches/00list index 0a49d99..d56213a 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1 +1 @@ -01_stylesheet.dpatch +02_style_xsl diff --git a/debian/patches/02_style_xsl.dpatch b/debian/patches/02_style_xsl.dpatch new file mode 100644 index 0000000..13f208b --- /dev/null +++ b/debian/patches/02_style_xsl.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_style_xsl.dpatch by Arnaud Vandyck <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: commented some errors in the stylesheet + +@DPATCH@ + +--- ./xdocs/style.xsl~ 2006-06-28 23:56:49.000000000 +0000 ++++ ./xdocs/style.xsl 2006-08-02 12:59:51.000000000 +0000 +@@ -77,15 +77,15 @@ + <img src="{$src}" align="left" alt="{$alt}" border="0"/> + </a> + <xsl:if test="project/logo"> +- <xsl:variable name="alt"> ++ <!-- xsl:variable name="alt"> + <xsl:value-of select="project/logo"/> +- </xsl:variable> ++ </xsl:variable --> + <xsl:variable name="home"> + <xsl:value-of select="project/@href"/> + </xsl:variable> +- <xsl:variable name="src"> ++ <!-- xsl:variable name="src"> + <xsl:value-of select="$relative-path"/><xsl:value-of select="project/logo/@href"/> +- </xsl:variable> ++ </xsl:variable --> + + <xsl:comment>APACHE LOGO</xsl:comment> + <a href="http://www.apache.org/";> diff --git a/debian/rules b/debian/rules index 320cebd..4947120 100755 --- a/debian/rules +++ b/debian/rules @@ -22,23 +22,24 @@ 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 native clean + cd native && ./configure --with-apxs=/usr/bin/apxs + $(MAKE) -C native +# exit 1 build-apache20: dh_testdir - -$(MAKE) -C jk/native clean - cd jk/native && ./configure --with-apxs=/usr/bin/apxs2 - $(MAKE) -C jk/native +# -$(MAKE) -C native clean + cd native && ./configure --with-apxs=/usr/bin/apxs2 + $(MAKE) -C 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 BUILDING - cd jk/build/docs && lynx -dump -nolist changelog.html > changelog + cd xdocs && install -d ../build/docs/ && cp -R * ../build/docs/ + 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 ## -------- CLEAN TARGETS @@ -47,22 +48,22 @@ clean-patched: dh_testdir dh_testroot rm -f build-stamp - rm -f jk/native/common/portable.h jk/native/common/stamp-h1 - rm -rf jk/build - rm -f jk/native/apache-1.3/Makefile jk/native/apache-1.3/Makefile.apxs - rm -f jk/native/apache-2.0/Makefile jk/native/apache-2.0/Makefile.apxs - rm -f jk/native/common/Makefile jk/native/common/list.mk - rm -f jk/native/jni/Makefile jk/native/Makefile jk/native/libtool - rm -f jk/native/config.status jk/native/config.log - rm -f jk/native/apache-1.3/mod_jk.o - rm -f jk/native/apache-1.3/mod_jk.la jk/native/apache-1.3/mod_jk.lo - rm -f jk/native/apache-1.3/mod_jk.a jk/native/apache-1.3/mod_jk.so* - rm -f jk/native/apache-2.0/mod_jk.o - rm -f jk/native/apache-2.0/mod_jk.la jk/native/apache-2.0/mod_jk.lo - rm -f jk/native/apache-2.0/mod_jk.a jk/native/apache-2.0/mod_jk.so* - 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 + 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/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 dh_clean @@ -82,8 +83,8 @@ install-arch: dh_testroot 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 + 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 dh_install -a @@ -96,7 +97,6 @@ unpatch: dpatch deapply-all rm -rf patch-stamp debian/patched - # Build architecture-independent files here. binary-indep: build-doc install-indep dh_testdir -i @@ -125,6 +125,6 @@ binary-arch: build build-apache13 build-apache20 install-arch dh_gencontrol -a dh_md5sums -a dh_builddeb -a - + binary: binary-arch binary-indep .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..bb0b030 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-(.*)/tomcat-connectors-(.*)-src\.tar\.gz debian uupdate -- 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
