r2316 - in trunk/libapache-mod-jk/debian: . patches

Arnaud Vandyck avdyk at costa.debian.org
Wed Aug 2 22:21:49 UTC 2006 

Author: avdyk
Date: 2006-08-02 22:21:48 +0000 (Wed, 02 Aug 2006)
New Revision: 2316

Added:
   trunk/libapache-mod-jk/debian/patches/02_style_xsl.dpatch
   trunk/libapache-mod-jk/debian/watch
Modified:
   trunk/libapache-mod-jk/debian/changelog
   trunk/libapache-mod-jk/debian/control
   trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.docs
   trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.examples
   trunk/libapache-mod-jk/debian/patches/00list
   trunk/libapache-mod-jk/debian/rules
Log:
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 <avdyk at debian.org>  Wed,  2 Aug 2006 11:11:03 +0200

Modified: trunk/libapache-mod-jk/debian/changelog
===================================================================
--- trunk/libapache-mod-jk/debian/changelog	2006-08-01 14:34:14 UTC (rev 2315)
+++ trunk/libapache-mod-jk/debian/changelog	2006-08-02 22:21:48 UTC (rev 2316)
@@ -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 <avdyk at debian.org>  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

Modified: trunk/libapache-mod-jk/debian/control
===================================================================
--- trunk/libapache-mod-jk/debian/control	2006-08-01 14:34:14 UTC (rev 2315)
+++ trunk/libapache-mod-jk/debian/control	2006-08-02 22:21:48 UTC (rev 2316)
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Uploaders: Stefan Gybas <sgybas at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Arnaud Vandyck <avdyk at debian.org>
 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

Modified: trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.docs
===================================================================
--- trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.docs	2006-08-01 14:34:14 UTC (rev 2315)
+++ trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.docs	2006-08-02 22:21:48 UTC (rev 2316)
@@ -1 +1 @@
-jk/build/docs/*
+build/docs/*

Modified: trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.examples
===================================================================
--- trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.examples	2006-08-01 14:34:14 UTC (rev 2315)
+++ trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.examples	2006-08-02 22:21:48 UTC (rev 2316)
@@ -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

Modified: trunk/libapache-mod-jk/debian/patches/00list
===================================================================
--- trunk/libapache-mod-jk/debian/patches/00list	2006-08-01 14:34:14 UTC (rev 2315)
+++ trunk/libapache-mod-jk/debian/patches/00list	2006-08-02 22:21:48 UTC (rev 2316)
@@ -1 +1 @@
-01_stylesheet.dpatch
+02_style_xsl

Added: trunk/libapache-mod-jk/debian/patches/02_style_xsl.dpatch
===================================================================
--- trunk/libapache-mod-jk/debian/patches/02_style_xsl.dpatch	2006-08-01 14:34:14 UTC (rev 2315)
+++ trunk/libapache-mod-jk/debian/patches/02_style_xsl.dpatch	2006-08-02 22:21:48 UTC (rev 2316)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_style_xsl.dpatch by Arnaud Vandyck <avdyk at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: commented some errors in the stylesheet
+
+ at 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/">

Modified: trunk/libapache-mod-jk/debian/rules
===================================================================
--- trunk/libapache-mod-jk/debian/rules	2006-08-01 14:34:14 UTC (rev 2315)
+++ trunk/libapache-mod-jk/debian/rules	2006-08-02 22:21:48 UTC (rev 2316)
@@ -22,23 +22,24 @@
 
 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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

Added: trunk/libapache-mod-jk/debian/watch
===================================================================
--- trunk/libapache-mod-jk/debian/watch	2006-08-01 14:34:14 UTC (rev 2315)
+++ trunk/libapache-mod-jk/debian/watch	2006-08-02 22:21:48 UTC (rev 2316)
@@ -0,0 +1,2 @@
+version=2
+http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-(.*)/tomcat-connectors-(.*)-src\.tar\.gz debian uupdate

More information about the pkg-java-commits mailing list