[pkg-java] r3008 - trunk/libapache-mod-jk/debian

[Michael Koch]

Author: mkoch
Date: 2007-02-17 17:22:12 +0100 (Sat, 17 Feb 2007)
New Revision: 3008

Modified:
   trunk/libapache-mod-jk/debian/
   trunk/libapache-mod-jk/debian/changelog
   trunk/libapache-mod-jk/debian/control
   trunk/libapache-mod-jk/debian/rules
Log:
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.




Property changes on: trunk/libapache-mod-jk/debian
___________________________________________________________________
Name: svn:ignore
   + files
libapache-mod-jk
libapache-mod-jk-doc
libapache2-mod-jk
patched
*.debhelper
*.substvars


Modified: trunk/libapache-mod-jk/debian/changelog
===================================================================
--- trunk/libapache-mod-jk/debian/changelog	2007-02-17 13:58:04 UTC (rev 3007)
+++ trunk/libapache-mod-jk/debian/changelog	2007-02-17 16:22:12 UTC (rev 3008)
@@ -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 <konqueror at gmx.de>  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:

Modified: trunk/libapache-mod-jk/debian/control
===================================================================
--- trunk/libapache-mod-jk/debian/control	2007-02-17 13:58:04 UTC (rev 3007)
+++ trunk/libapache-mod-jk/debian/control	2007-02-17 16:22:12 UTC (rev 3008)
@@ -2,17 +2,17 @@
 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>, Arnaud Vandyck <avdyk at debian.org>
+Uploaders: Stefan Gybas <sgybas at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
 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 @@
 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

Modified: trunk/libapache-mod-jk/debian/rules
===================================================================
--- trunk/libapache-mod-jk/debian/rules	2007-02-17 13:58:04 UTC (rev 3007)
+++ trunk/libapache-mod-jk/debian/rules	2007-02-17 16:22:12 UTC (rev 3008)
@@ -17,6 +17,9 @@
 build: patch build-stamp
 build-stamp:  
 	dh_testdir
+	
+	cp -a native native-apache2
+	
 	touch build-stamp
 
 
@@ -30,8 +33,9 @@
 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 @@
 	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 @@
 	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 @@
 	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