[pkg-java] r13851 - in tags/libapache-mod-jk: . 1:1.2.32-1/debian 1:1.2.32-1/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Jul 13 23:24:48 UTC 2011
Author: drazzib
Date: 2011-07-13 23:24:48 +0000 (Wed, 13 Jul 2011)
New Revision: 13851
Added:
tags/libapache-mod-jk/1:1.2.32-1/
tags/libapache-mod-jk/1:1.2.32-1/debian/changelog
tags/libapache-mod-jk/1:1.2.32-1/debian/compat
tags/libapache-mod-jk/1:1.2.32-1/debian/control
tags/libapache-mod-jk/1:1.2.32-1/debian/copyright
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk-doc.doc-base
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.NEWS
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.README.Debian
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.install
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.links
tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0002-debianize-log-directory.patch
tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0003-upgrade-info-to-error-message.patch
tags/libapache-mod-jk/1:1.2.32-1/debian/patches/series
tags/libapache-mod-jk/1:1.2.32-1/debian/rules
tags/libapache-mod-jk/1:1.2.32-1/debian/watch
Removed:
tags/libapache-mod-jk/1:1.2.32-1/debian/500mod_jk.info
tags/libapache-mod-jk/1:1.2.32-1/debian/README.source
tags/libapache-mod-jk/1:1.2.32-1/debian/changelog
tags/libapache-mod-jk/1:1.2.32-1/debian/compat
tags/libapache-mod-jk/1:1.2.32-1/debian/control
tags/libapache-mod-jk/1:1.2.32-1/debian/copyright
tags/libapache-mod-jk/1:1.2.32-1/debian/httpd_example_apache.conf
tags/libapache-mod-jk/1:1.2.32-1/debian/httpd_example_apache2.conf
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk-doc.doc-base
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.README.Debian
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.dirs
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.docs
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.install
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.postinst
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.prerm
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.NEWS
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.README.Debian
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.docs
tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.install
tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0002-debianize-log-directory.patch
tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0003-upgrade-info-to-error-message.patch
tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0004-update-config.guess-and-config.sub.patch
tags/libapache-mod-jk/1:1.2.32-1/debian/patches/series
tags/libapache-mod-jk/1:1.2.32-1/debian/rules
tags/libapache-mod-jk/1:1.2.32-1/debian/watch
Log:
[svn-buildpackage] Tagging libapache-mod-jk 1:1.2.32-1
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/500mod_jk.info
===================================================================
--- trunk/libapache-mod-jk/debian/500mod_jk.info 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/500mod_jk.info 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,20 +0,0 @@
-LoadModule: jk_module /usr/lib/apache/1.3/mod_jk.so
-Directives:
- JkMountCopy
- JkMount
- JkAutoMount
- JkWorkersFile
- JkLogFile
- JkLogLevel
- JkLogStampFormat
- JkAutoAlias
- JkRequestLogFormat
- JkExtractSSL
- JkHTTPSIndicator
- JkCERTSIndicator
- JkCIPHERIndicator
- JkSESSIONIndicator
- JkKEYSIZEIndicator
- JkOptions
- JkEnvVar
-Description: Tomcat connector for Java servlets and web applications
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/README.source
===================================================================
--- trunk/libapache-mod-jk/debian/README.source 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/README.source 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,6 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/dpatch/README.source.gz for a detailed explanation.
-
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/changelog
===================================================================
--- trunk/libapache-mod-jk/debian/changelog 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/changelog 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,219 +0,0 @@
-libapache-mod-jk (1:1.2.31-1) unstable; urgency=low
-
- * Team upload.
- * Bump debhelper compatibility level to 7.
- * Bump Standards-Version to 3.9.1. No changes were required.
- * Remove duplicated control fields in binary packages.
- * Fix lintian warning about dh_clean -k deprecation.
- * Update package section to httpd.
- * Document in NEWS the minimal Linux version needed (>= 2.6.27) to use
- this module.
-
- -- Miguel Landaeta <miguel at miguel.cc> Tue, 15 Feb 2011 09:29:23 -0430
-
-libapache-mod-jk (1:1.2.30-1) unstable; urgency=low
-
- * Team upload
- * New upstream release
- * Convert patches to dep3 format.
- * Switch to source format 3.0.
- * Remove Stefan (Gybas) and Arnaud from Uploaders list. Thanks to your
- contribution in the past!
- * Add Vcs-* headers.
- * Add missing Depends: ${misc:Depends}.
- * Update Standards-Version: 3.9.0 (no changes).
- * Update patch for config.guess and config.sub.
- * Switch to tomcat6 and default-java in workers.properties. Thanks to
- Olivier Berger. (Closes: #590078)
-
- -- Torsten Werner <twerner at debian.org> Sat, 24 Jul 2010 01:04:36 +0200
-
-libapache-mod-jk (1:1.2.28-2) unstable; urgency=low
-
- * Added debian/patches/05_config_update.dpatch which updates
- config.{guess|sub} in native/scripts/build/unix/ (Closes: #540392).
- * debian/control: Let libapache2-mod-jk suggest tomcat6 instead of
- tomcat5.5.
- * Added debian/README.source.
- * Updated Standards-Version to 3.8.3.
-
- -- Michael Koch <konqueror at gmx.de> Thu, 20 Aug 2009 20:04:39 +0200
-
-libapache-mod-jk (1:1.2.28-1) unstable; urgency=low
-
- * New upstream release.
- - Removed debian/patches/05_bug_451494.dpatch. Applied upstream.
- - Removed debian/patches/06_CVE-2008-5519.dpatch. Applied upstream.
- * Updated Build-Depends to debhelper (>= 5) as 4 is deprecated.
- * Link /usr/share/common-licenses/Apache-2.0 in debian/copgyright.
- * Updated Standards-Version to 3.8.2.
-
- -- Michael Koch <konqueror at gmx.de> Sat, 25 Jul 2009 23:08:41 +0200
-
-libapache-mod-jk (1:1.2.26-2.1) unstable; urgency=high
-
- * Non-maintainer upload by the security-team.
- * CVE-2008-5519: Fix information disclosure vulnerability when clients
- abort connection before sending POST body (closes: #523054).
-
- -- Stefan Fritsch <sf at debian.org> Sat, 30 May 2009 15:49:20 +0200
-
-libapache-mod-jk (1:1.2.26-2) unstable; urgency=low
-
- * Apply patch to fix JkOptions handling for virtual hosts. Thanks to
- Toshihiro Sasajima for the patch, Closes: #451494
- * Fixed debian/copyright to mention copyright and license properly.
- * debian/libapache-mod-jk-doc.doc-base: Moved to section
- System/Administration.
- * Remove unused lintian override for libapache-mod-jk-doc.
-
- -- Michael Koch <konqueror at gmx.de> Wed, 02 Apr 2008 23:09:41 +0200
-
-libapache-mod-jk (1:1.2.26-1) unstable; urgency=low
-
- * New upstream release.
- * Updated Standards-Version to 3.7.3.
- * Fixed URL in Homepage field.
- * Fixed typo in debian/libapache2-mod-jk.NEWS.
-
- -- Michael Koch <konqueror at gmx.de> Thu, 27 Dec 2007 13:04:55 -0100
-
-libapache-mod-jk (1:1.2.25-2) unstable; urgency=low
-
- * debian/workers.properties: Renamed worker.loadbalancer.balanced_workers to
- worker.loadbalancer.balance_workers. Closes: #448062.
-
- -- Michael Koch <konqueror at gmx.de> Thu, 25 Oct 2007 21:18:33 +0200
-
-libapache-mod-jk (1:1.2.25-1) unstable; urgency=low
-
- * New upstream release.
- * Don't suggest tomcat5 anymore.
- * Use Homepage: field in debian/control
-
- -- Michael Koch <konqueror at gmx.de> Sat, 15 Sep 2007 09:07:30 +0200
-
-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 <konqueror at gmx.de> 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 <konqueror at gmx.de> 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 <konqueror at gmx.de> Sat, 09 Jun 2007 16:06:13 -0100
-
-libapache-mod-jk (1:1.2.23-1) unstable; urgency=high
-
- * New upstream release.
- - Forward unparsed URI to tomcat. Closes: #425836.
- CVE-2007-1860
-
- -- Michael Koch <konqueror at gmx.de> Sat, 2 Jun 2007 23:14:13 +0200
-
-libapache-mod-jk (1:1.2.22-1) unstable; urgency=low
-
- * New upstream release
- - works when no JkWorkersFile option set (Closes: #419448).
- * Added debian/patches/04_no-worker-error.dpatch to make the message
- "Could not find worker" an error and more visible (Closes: #418887).
-
- -- Michael Koch <konqueror at gmx.de> Tue, 17 Apr 2007 08:12:38 +0200
-
-libapache-mod-jk (1:1.2.21-1) unstable; urgency=low
-
- * New upstream release
-
- -- Michael Koch <konqueror at gmx.de> Thu, 12 Apr 2007 07:21:37 +0000
-
-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:
- #391651), thanks to Philippe Marzouk.
- * debian/patches/03_jk-runtime-status_default_location.dpatch:
- added. This change the default location of JkShmFile variable (closes:
- #362004), thanks to Adrian Bridgett.
-
- -- Arnaud Vandyck <avdyk at debian.org> Mon, 9 Oct 2006 15:41:47 +0200
-
-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
- arch and indep install targets
-
- -- Wolfgang Baer <WBaer at gmx.de> 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
- * Build Apache2 package (closes: #296345)
- + debian/control: package libapache2-mod-jk added
- + debian/control: added apache2-threaded-dev build dependency
- * 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 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 <WBaer at gmx.de> Tue, 6 Sep 2005 14:43:49 +0200
-
-libapache-mod-jk (1:1.2.5-2) unstable; urgency=low
-
- * Added libtool build dependency (closes: #229395)
-
- -- Stefan Gybas <sgybas at debian.org> Fri, 30 Jan 2004 17:22:12 +0100
-
-libapache-mod-jk (1:1.2.5-1) unstable; urgency=low
-
- * New upstream release (libapache-mod-jk was previously built by the tomcat
- source package)
- * Updated download location in copyright file
- * Mention in the long description that this module can talk to a remote
- Tomcat server so it can go into main
- * Updated to the new module handling in Apache 1.3.29 and support Apache,
- Apache-Perl and Apache-SSL
-
- -- Stefan Gybas <sgybas at debian.org> Sat, 10 Jan 2004 17:18:52 +0100
-
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/changelog (from rev 13850, trunk/libapache-mod-jk/debian/changelog)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/changelog (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/changelog 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1,246 @@
+libapache-mod-jk (1:1.2.32-1) unstable; urgency=low
+
+ * New upstream release:
+ - Fix whitespace trimming when parsing attribute lists. LP: #592576.
+ * Add myself in Uploaders.
+ * Include a sensible default configuration in
+ /etc/apache2/mods-available/jk.conf
+ and remove old sample in /usr/share/doc/libapache2-mod-jk/.
+ LP: #118649.
+ * Describe changes in upstream handling of JkMount in global scope
+ vs in VirtualHost scope (in d/README and default configuration).
+ Closes: #460398.
+ * Bump Standards-Version to 3.9.2:
+ - d/control: Add recommended get-orig-source target.
+ * d/watch: Update to new upstream layout.
+ * Refresh patches.
+ * d/copyright: Upgrade to DEP-5 format.
+ * d/README.source: Removed (aka dpatch one)
+ * d/libapache-mod-jk.*: Remove old traces from Apache 1.3
+ (dropped since lenny).
+ * d/rules: Switch to dh7 handling.
+ * d/compat: Switch to debhelper compat level 8.
+ * Replace d/patches/0004 by autotools_dev dh sequence addons.
+ * d/rules: Enable LFS with -D_FILE_OFFSET_BITS=64. Closes: #590075.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 14 Jul 2011 01:15:52 +0200
+
+libapache-mod-jk (1:1.2.31-1) unstable; urgency=low
+
+ * Team upload.
+ * Bump debhelper compatibility level to 7.
+ * Bump Standards-Version to 3.9.1. No changes were required.
+ * Remove duplicated control fields in binary packages.
+ * Fix lintian warning about dh_clean -k deprecation.
+ * Update package section to httpd.
+ * Document in NEWS the minimal Linux version needed (>= 2.6.27) to use
+ this module.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Tue, 15 Feb 2011 09:29:23 -0430
+
+libapache-mod-jk (1:1.2.30-1) unstable; urgency=low
+
+ * Team upload
+ * New upstream release
+ * Convert patches to dep3 format.
+ * Switch to source format 3.0.
+ * Remove Stefan (Gybas) and Arnaud from Uploaders list. Thanks to your
+ contribution in the past!
+ * Add Vcs-* headers.
+ * Add missing Depends: ${misc:Depends}.
+ * Update Standards-Version: 3.9.0 (no changes).
+ * Update patch for config.guess and config.sub.
+ * Switch to tomcat6 and default-java in workers.properties. Thanks to
+ Olivier Berger. (Closes: #590078)
+
+ -- Torsten Werner <twerner at debian.org> Sat, 24 Jul 2010 01:04:36 +0200
+
+libapache-mod-jk (1:1.2.28-2) unstable; urgency=low
+
+ * Added debian/patches/05_config_update.dpatch which updates
+ config.{guess|sub} in native/scripts/build/unix/ (Closes: #540392).
+ * debian/control: Let libapache2-mod-jk suggest tomcat6 instead of
+ tomcat5.5.
+ * Added debian/README.source.
+ * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 20 Aug 2009 20:04:39 +0200
+
+libapache-mod-jk (1:1.2.28-1) unstable; urgency=low
+
+ * New upstream release.
+ - Removed debian/patches/05_bug_451494.dpatch. Applied upstream.
+ - Removed debian/patches/06_CVE-2008-5519.dpatch. Applied upstream.
+ * Updated Build-Depends to debhelper (>= 5) as 4 is deprecated.
+ * Link /usr/share/common-licenses/Apache-2.0 in debian/copgyright.
+ * Updated Standards-Version to 3.8.2.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 25 Jul 2009 23:08:41 +0200
+
+libapache-mod-jk (1:1.2.26-2.1) unstable; urgency=high
+
+ * Non-maintainer upload by the security-team.
+ * CVE-2008-5519: Fix information disclosure vulnerability when clients
+ abort connection before sending POST body (closes: #523054).
+
+ -- Stefan Fritsch <sf at debian.org> Sat, 30 May 2009 15:49:20 +0200
+
+libapache-mod-jk (1:1.2.26-2) unstable; urgency=low
+
+ * Apply patch to fix JkOptions handling for virtual hosts. Thanks to
+ Toshihiro Sasajima for the patch, Closes: #451494
+ * Fixed debian/copyright to mention copyright and license properly.
+ * debian/libapache-mod-jk-doc.doc-base: Moved to section
+ System/Administration.
+ * Remove unused lintian override for libapache-mod-jk-doc.
+
+ -- Michael Koch <konqueror at gmx.de> Wed, 02 Apr 2008 23:09:41 +0200
+
+libapache-mod-jk (1:1.2.26-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated Standards-Version to 3.7.3.
+ * Fixed URL in Homepage field.
+ * Fixed typo in debian/libapache2-mod-jk.NEWS.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 27 Dec 2007 13:04:55 -0100
+
+libapache-mod-jk (1:1.2.25-2) unstable; urgency=low
+
+ * debian/workers.properties: Renamed worker.loadbalancer.balanced_workers to
+ worker.loadbalancer.balance_workers. Closes: #448062.
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 25 Oct 2007 21:18:33 +0200
+
+libapache-mod-jk (1:1.2.25-1) unstable; urgency=low
+
+ * New upstream release.
+ * Don't suggest tomcat5 anymore.
+ * Use Homepage: field in debian/control
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 15 Sep 2007 09:07:30 +0200
+
+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 <konqueror at gmx.de> 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 <konqueror at gmx.de> 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 <konqueror at gmx.de> Sat, 09 Jun 2007 16:06:13 -0100
+
+libapache-mod-jk (1:1.2.23-1) unstable; urgency=high
+
+ * New upstream release.
+ - Forward unparsed URI to tomcat. Closes: #425836.
+ CVE-2007-1860
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 2 Jun 2007 23:14:13 +0200
+
+libapache-mod-jk (1:1.2.22-1) unstable; urgency=low
+
+ * New upstream release
+ - works when no JkWorkersFile option set (Closes: #419448).
+ * Added debian/patches/04_no-worker-error.dpatch to make the message
+ "Could not find worker" an error and more visible (Closes: #418887).
+
+ -- Michael Koch <konqueror at gmx.de> Tue, 17 Apr 2007 08:12:38 +0200
+
+libapache-mod-jk (1:1.2.21-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Michael Koch <konqueror at gmx.de> Thu, 12 Apr 2007 07:21:37 +0000
+
+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:
+ #391651), thanks to Philippe Marzouk.
+ * debian/patches/03_jk-runtime-status_default_location.dpatch:
+ added. This change the default location of JkShmFile variable (closes:
+ #362004), thanks to Adrian Bridgett.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 9 Oct 2006 15:41:47 +0200
+
+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
+ arch and indep install targets
+
+ -- Wolfgang Baer <WBaer at gmx.de> 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
+ * Build Apache2 package (closes: #296345)
+ + debian/control: package libapache2-mod-jk added
+ + debian/control: added apache2-threaded-dev build dependency
+ * 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 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 <WBaer at gmx.de> Tue, 6 Sep 2005 14:43:49 +0200
+
+libapache-mod-jk (1:1.2.5-2) unstable; urgency=low
+
+ * Added libtool build dependency (closes: #229395)
+
+ -- Stefan Gybas <sgybas at debian.org> Fri, 30 Jan 2004 17:22:12 +0100
+
+libapache-mod-jk (1:1.2.5-1) unstable; urgency=low
+
+ * New upstream release (libapache-mod-jk was previously built by the tomcat
+ source package)
+ * Updated download location in copyright file
+ * Mention in the long description that this module can talk to a remote
+ Tomcat server so it can go into main
+ * Updated to the new module handling in Apache 1.3.29 and support Apache,
+ Apache-Perl and Apache-SSL
+
+ -- Stefan Gybas <sgybas at debian.org> Sat, 10 Jan 2004 17:18:52 +0100
+
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/compat
===================================================================
--- trunk/libapache-mod-jk/debian/compat 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/compat 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1 +0,0 @@
-7
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/compat (from rev 13850, trunk/libapache-mod-jk/debian/compat)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/compat (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/compat 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1 @@
+8
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/control
===================================================================
--- trunk/libapache-mod-jk/debian/control 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/control 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,39 +0,0 @@
-Source: libapache-mod-jk
-Section: httpd
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), apache2-threaded-dev, libtool
-Build-Depends-Indep: xsltproc, lynx
-Standards-Version: 3.9.1
-Homepage: http://tomcat.apache.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libapache-mod-jk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libapache-mod-jk/
-
-Package: libapache2-mod-jk
-Architecture: any
-Depends: ${shlibs:Depends}, apache2.2-common, apache2, ${misc:Depends}
-Suggests: tomcat6, 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.
- .
- This package contains an Apache 2 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.
-
-Package: libapache-mod-jk-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: libapache2-mod-jk
-Conflicts: libapache-mod-jk (<= 1.2.5-2)
-Replaces: libapache-mod-jk (<= 1.2.5-2)
-Description: Documentation of libapache2-mod-jk package
- Documentation and examples of the Apache jk connector for the Tomcat
- Java servlet engine.
- .
- For uptodate documentation about Tomcat connectors please take a look
- at the home page at http://tomcat.apache.org/connectors-doc/.
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/control (from rev 13850, trunk/libapache-mod-jk/debian/control)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/control (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/control 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1,39 @@
+Source: libapache-mod-jk
+Section: httpd
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 8), apache2-threaded-dev, libtool, autotools-dev
+Build-Depends-Indep: xsltproc, lynx
+Standards-Version: 3.9.2
+Homepage: http://tomcat.apache.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libapache-mod-jk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libapache-mod-jk/
+
+Package: libapache2-mod-jk
+Architecture: any
+Depends: ${shlibs:Depends}, apache2.2-common, apache2, ${misc:Depends}
+Suggests: tomcat6, 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.
+ .
+ This package contains an Apache 2 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.
+
+Package: libapache-mod-jk-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libapache2-mod-jk
+Conflicts: libapache-mod-jk (<= 1.2.5-2)
+Replaces: libapache-mod-jk (<= 1.2.5-2)
+Description: Documentation of libapache2-mod-jk package
+ Documentation and examples of the Apache jk connector for the Tomcat
+ Java servlet engine.
+ .
+ For uptodate documentation about Tomcat connectors please take a look
+ at the home page at http://tomcat.apache.org/connectors-doc/.
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/copyright
===================================================================
--- trunk/libapache-mod-jk/debian/copyright 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/copyright 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,24 +0,0 @@
-This package was debianized by Stefan Gybas <sgybas at debian.org> on
-11-Nov-2003. The source archive was downloaded from
-http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/.
-
-Authors: The Apache Jakarta team
-
-Copyright: (c) 2003-2009 Apache Foundation
-
-License:
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-On Debian system the full text of the Apache License, Version 2.0, can be
-found in /usr/share/common-licenses/Apache-2.0.
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/copyright (from rev 13850, trunk/libapache-mod-jk/debian/copyright)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/copyright (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/copyright 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1,18 @@
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Apache Tomcat JK Connector
+Upstream-Contact: <http://tomcat.apache.org/connectors-doc/>
+Source: http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/
+
+Files: *
+Copyright: Copyright (c) 1999-2011 Apache Foundation
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2003, Stefan Gybas <sgybas at debian.org>
+Copyright: 2009, Michael Koch <konqueror at gmx.de>
+Copyright: 2011, Damien Raude-Morvan <drazzib at debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ A complete copy of the Apache License, Version 2.0, can be found in
+ /usr/share/common-licenses/Apache-2.0 on Debian Systems.
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/httpd_example_apache.conf
===================================================================
--- trunk/libapache-mod-jk/debian/httpd_example_apache.conf 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/httpd_example_apache.conf 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,39 +0,0 @@
-# Sample mod_jk configuration
-# for Apache 1.3
-#
-# for all commands/options available see the manual
-# provided in libapache-mod-jk-doc package.
-
-# The location where mod_jk will find the workers definitions
-JkWorkersFile /etc/libapache-mod-jk/workers.properties
-
-# The location where mod_jk is going to place its log file
-JkLogFile /var/log/apache/mod_jk.log
-
-# The log level:
-# - info log will contain standard mod_jk activity (default).
-# - warn log will contain non fatal error reports.
-# - error log will contain also error reports.
-# - debug log will contain all information on mod_jk activity
-# - trace log will contain all tracing information on mod_jk activity
-JkLogLevel info
-
-
-# Assign specific URLs to Tomcat. In general the structure of a
-# JkMount directive is: JkMount [URL prefix] [Worker name]
-
-# send all requests ending in .jsp to ajp13_worker
-JkMount /*.jsp ajp13_worker
-# send all requests ending /servlet to ajp13_worker
-JkMount /*/servlet/ ajp13_worker
-
-# JkUnmount directive acts as an opposite to JkMount and blocks access
-# to a particular URL. The purpose is to be able to filter out the
-# particular content types from mounted context.
-
-# do not send requests ending with .gif to ajp13_worker
-#JkUnMount /servlet/*.gif ajp13_worker
-
-
-# JkMount / JkUnMount directives can also be used inside <VirtualHost>
-# sections of your httpd.conf file.
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/httpd_example_apache2.conf
===================================================================
--- trunk/libapache-mod-jk/debian/httpd_example_apache2.conf 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/httpd_example_apache2.conf 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,39 +0,0 @@
-# Sample mod_jk configuration
-# for Apache 2
-#
-# for all commands/options available see the manual
-# provided in libapache-mod-jk-doc package.
-
-# The location where mod_jk will find the workers definitions
-JkWorkersFile /etc/libapache2-mod-jk/workers.properties
-
-# The location where mod_jk is going to place its log file
-JkLogFile /var/log/apache2/mod_jk.log
-
-# The log level:
-# - info log will contain standard mod_jk activity (default).
-# - warn log will contain non fatal error reports.
-# - error log will contain also error reports.
-# - debug log will contain all information on mod_jk activity
-# - trace log will contain all tracing information on mod_jk activity
-JkLogLevel info
-
-
-# Assign specific URLs to Tomcat. In general the structure of a
-# JkMount directive is: JkMount [URL prefix] [Worker name]
-
-# send all requests ending in .jsp to ajp13_worker
-JkMount /*.jsp ajp13_worker
-# send all requests ending /servlet to ajp13_worker
-JkMount /*/servlet/ ajp13_worker
-
-# JkUnmount directive acts as an opposite to JkMount and blocks access
-# to a particular URL. The purpose is to be able to filter out the
-# particular content types from mounted context.
-
-# do not send requests ending with .gif to ajp13_worker
-#JkUnMount /servlet/*.gif ajp13_worker
-
-
-# JkMount / JkUnMount directives can also be used inside <VirtualHost>
-# sections of your httpd.conf file.
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk-doc.doc-base
===================================================================
--- trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.doc-base 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk-doc.doc-base 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,10 +0,0 @@
-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: System/Administration
-
-Format: HTML
-Index: /usr/share/doc/libapache-mod-jk-doc/index.html
-Files: /usr/share/doc/libapache-mod-jk-doc/*.html
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk-doc.doc-base (from rev 13850, trunk/libapache-mod-jk/debian/libapache-mod-jk-doc.doc-base)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk-doc.doc-base (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk-doc.doc-base 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1,10 @@
+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 2.0
+Section: System/Administration
+
+Format: HTML
+Index: /usr/share/doc/libapache-mod-jk-doc/index.html
+Files: /usr/share/doc/libapache-mod-jk-doc/*.html
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.README.Debian
===================================================================
--- trunk/libapache-mod-jk/debian/libapache-mod-jk.README.Debian 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.README.Debian 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,16 +0,0 @@
-libapache-mod-jk for Debian
-----------------------------------
-
-Packages for Apache 1.3 and Apache 2 are provided. The documentation
-can be found in the libapache-mod-jk-doc package.
-
-To enable the Apache - Tomcat connector you have to edit your
-httpd.conf to include the necessary commands. An example configuration
-is provided with the package - see httpd_example_apache.conf
-
-One default worker named ajp13_worker, which connects to the localhost on
-port 8009, is configured. If you need more workers or want to connect to
-a remote tomcat you have to modify the workers.properties file.
-
-
- -- Wolfgang Baer <WBaer at gmx.de> Thu, 23 Jun 2005 22:42:54 +0200
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.dirs
===================================================================
--- trunk/libapache-mod-jk/debian/libapache-mod-jk.dirs 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.dirs 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,2 +0,0 @@
-usr/lib/apache/1.3/
-etc/libapache-mod-jk/
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.docs
===================================================================
--- trunk/libapache-mod-jk/debian/libapache-mod-jk.docs 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.docs 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1 +0,0 @@
-debian/httpd_example_apache.conf
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.install
===================================================================
--- trunk/libapache-mod-jk/debian/libapache-mod-jk.install 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.install 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,3 +0,0 @@
-debian/500mod_jk.info /usr/lib/apache/1.3/
-debian/workers.properties /etc/libapache-mod-jk/
-
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.postinst
===================================================================
--- trunk/libapache-mod-jk/debian/libapache-mod-jk.postinst 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.postinst 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-case "$1" in
- configure)
-
- # Only activate mod_jk if this is not an upgrade
- if [ -z "$2" ]; then
- for i in apache apache-perl apache-ssl; do
- if [ -r /etc/$i/modules.conf ]; then
- /usr/sbin/modules-config $i enable mod_jk
- fi
- done
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-exit 0
-
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.prerm
===================================================================
--- trunk/libapache-mod-jk/debian/libapache-mod-jk.prerm 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache-mod-jk.prerm 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-case "$1" in
- upgrade|failed-upgrade)
- # Nothing to do here
- ;;
-
- deconfigure|remove)
- # Disable mod_jk if this is not an upgrade
- for i in apache apache-perl apache-ssl; do
- if [ -r /etc/$i/modules.conf ]; then
- /usr/sbin/modules-config $i disable mod_jk quiet
- fi
- done
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-exit 0
-
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.NEWS
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.NEWS 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.NEWS 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,19 +0,0 @@
-libapache-mod-jk (1:1.2.31-1) unstable; urgency=low
-
- Since 1.2.31 libapache-mod-jk is compiled under kernels with support for
- the SOCK_CLOEXEC flag in socket(2) syscall. Because of this, on Linux
- systems, libapache-mod-jk only works with kernel versions >= 2.6.27.
-
- -- Miguel Landaeta <miguel at miguel.cc> Sun, 13 Feb 2011 19:17:43 -0430
-
-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 separately
- (libapache-mod-jk-doc).
-
- -- Wolfgang Baer <WBaer at gmx.de> Thu, 23 Jun 2005 22:42:54 +0200
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.NEWS (from rev 13850, trunk/libapache-mod-jk/debian/libapache2-mod-jk.NEWS)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.NEWS (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.NEWS 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1,36 @@
+libapache2-mod-jk (1:1.2.32-1) unstable; urgency=low
+
+ libapache2-mod-jk now provide a default configuration file for Apache 2.x.
+ This file is located at /etc/apache2/mods-available/jk.conf.
+ Please note, that this configuration will be activated on first installation
+ or when (re-)enabling jk module with "a2enmod jk".
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 14 Jul 2011 01:15:52 +0200
+
+libapache2-mod-jk (1:1.2.31-1) unstable; urgency=low
+
+ Since 1.2.31 libapache2-mod-jk is compiled under kernels with support for
+ the SOCK_CLOEXEC flag in socket(2) syscall. Because of this, on Linux
+ systems, libapache-mod-jk only works with kernel versions >= 2.6.27.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Sun, 13 Feb 2011 19:17:43 -0430
+
+libapache2-mod-jk (1:1.2.26-1) unstable; urgency=low
+
+ Since 1.2.26, please note that by default no mounts will be inherited from the
+ global scope to any VirtualHost. See JkMountCopy option documentation
+ for more information (and Debian bug #460398).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 14 Jul 2011 01:15:52 +0200
+
+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 separately
+ (libapache-mod-jk-doc).
+
+ -- Wolfgang Baer <WBaer at gmx.de> Thu, 23 Jun 2005 22:42:54 +0200
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.README.Debian
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.README.Debian 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.README.Debian 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,16 +0,0 @@
-libapache2-mod-jk for Debian
-----------------------------------
-
-Packages for Apache 1.3 and Apache 2 are provided. The documentation
-can be found in the libapache-mod-jk-doc package.
-
-To enable the Apache - Tomcat connector you have to edit your
-httpd.conf to include the necessary commands. An example configuration
-is provided with the package - see httpd_example_apache2.conf
-
-One default worker named ajp13_worker, which connects to the localhost on
-port 8009, is configured. If you need more workers or want to connect to
-a remote tomcat you have to modify the workers.properties file.
-
-
- -- Wolfgang Baer <WBaer at gmx.de> Thu, 23 Jun 2005 22:42:54 +0200
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.README.Debian (from rev 13850, trunk/libapache-mod-jk/debian/libapache2-mod-jk.README.Debian)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.README.Debian (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.README.Debian 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1,23 @@
+libapache2-mod-jk for Debian
+----------------------------------
+
+Package works with Apache 2.x HTTP server.
+The documentation can be found in the libapache-mod-jk-doc package.
+
+At install, this module is enabled into existing Apache2 configuration.
+Default configuration is located here :
+ /etc/apache2/mods-available/jk.conf
+
+One default worker named ajp13_worker, which connects to the localhost on
+port 8009, is configured. If you need more workers or want to connect to
+a remote tomcat you have to modify the workers.properties file.
+
+By default, no webapp is mounted so you'll have to edit jk.conf
+to enable, at least, a JkMount directive for you webapp.
+
+Please pay attention to global scope vs VirtualHost when setting JkMount
+(see #460398) as, by default, no mounts will be inherited from the
+global scope to any VirtualHost. See JkMountCopy option documentation
+for more information.
+
+ -- Wolfgang Baer <WBaer at gmx.de> Thu, 23 Jun 2005 22:42:54 +0200
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.docs
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.docs 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.docs 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1 +0,0 @@
-debian/httpd_example_apache2.conf
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.install
===================================================================
--- trunk/libapache-mod-jk/debian/libapache2-mod-jk.install 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.install 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,3 +0,0 @@
-debian/workers.properties /etc/libapache2-mod-jk/
-debian/jk.load /etc/apache2/mods-available/
-
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.install (from rev 13850, trunk/libapache-mod-jk/debian/libapache2-mod-jk.install)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.install (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.install 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1,4 @@
+debian/workers.properties /etc/libapache2-mod-jk/
+debian/jk.load /etc/apache2/mods-available/
+conf/jk.conf /etc/apache2/mods-available/
+native/apache-2.0/mod_jk.so /usr/lib/apache2/modules/
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.links (from rev 13850, trunk/libapache-mod-jk/debian/libapache2-mod-jk.links)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.links (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/libapache2-mod-jk.links 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1 @@
+/etc/apache2/mods-available/jk.conf /etc/libapache2-mod-jk/httpd-jk.conf
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0002-debianize-log-directory.patch
===================================================================
--- trunk/libapache-mod-jk/debian/patches/0002-debianize-log-directory.patch 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0002-debianize-log-directory.patch 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,24 +0,0 @@
-From: Arnaud Vandyck <avdyk at debian.org>
-Date: Sat, 24 Jul 2010 00:26:20 +0200
-Subject: [PATCH] debianize log directory
-
----
- native/apache-2.0/mod_jk.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/native/apache-2.0/mod_jk.c b/native/apache-2.0/mod_jk.c
-index 3c85c45..8fa5ad1 100644
---- a/native/apache-2.0/mod_jk.c
-+++ b/native/apache-2.0/mod_jk.c
-@@ -104,8 +104,8 @@
- #include "jk_shm.h"
- #include "jk_url.h"
-
--#define JK_LOG_DEF_FILE ("logs/mod_jk.log")
--#define JK_SHM_DEF_FILE ("logs/jk-runtime-status")
-+#define JK_LOG_DEF_FILE ("/var/log/apache2/mod_jk.log")
-+#define JK_SHM_DEF_FILE ("/var/log/apache2/jk-runtime-status")
- #define JK_ENV_REMOTE_ADDR ("JK_REMOTE_ADDR")
- #define JK_ENV_REMOTE_HOST ("JK_REMOTE_HOST")
- #define JK_ENV_REMOTE_USER ("JK_REMOTE_USER")
---
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0002-debianize-log-directory.patch (from rev 13850, trunk/libapache-mod-jk/debian/patches/0002-debianize-log-directory.patch)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0002-debianize-log-directory.patch (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0002-debianize-log-directory.patch 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1,49 @@
+Author: Arnaud Vandyck <avdyk at debian.org>
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-07-13
+Description: Debianize log directory (in source code and default configuration)
+--- a/native/apache-2.0/mod_jk.c
++++ b/native/apache-2.0/mod_jk.c
+@@ -98,8 +98,8 @@
+ #include "jk_shm.h"
+ #include "jk_url.h"
+
+-#define JK_LOG_DEF_FILE ("logs/mod_jk.log")
+-#define JK_SHM_DEF_FILE ("logs/jk-runtime-status")
++#define JK_LOG_DEF_FILE ("/var/log/apache2/mod_jk.log")
++#define JK_SHM_DEF_FILE ("/var/log/apache2/jk-runtime-status")
+ #define JK_ENV_REMOTE_ADDR ("JK_REMOTE_ADDR")
+ #define JK_ENV_REMOTE_PORT ("JK_REMOTE_PORT")
+ #define JK_ENV_REMOTE_HOST ("JK_REMOTE_HOST")
+--- a/conf/httpd-jk.conf
++++ b/conf/httpd-jk.conf
+@@ -16,26 +16,21 @@
+ # Configuration Example for mod_jk
+ # used in combination with Apache 2.2.x
+
+-# Change the path and file name of the module, in case
+-# you have installed it outside of httpd, or using
+-# a versioned file name.
+-LoadModule jk_module modules/mod_jk.so
+-
+ <IfModule jk_module>
+
+ # We need a workers file exactly once
+ # and in the global server
+- JkWorkersFile conf/workers.properties
++ JkWorkersFile /etc/libapache2-mod-jk/workers.properties
+
+ # Our JK error log
+ # You can (and should) use rotatelogs here
+- JkLogFile logs/mod_jk.log
++ JkLogFile /var/log/apache2/mod_jk.log
+
+ # Our JK log level (trace,debug,info,warn,error)
+ JkLogLevel info
+
+ # Our JK shared memory file
+- JkShmFile logs/mod_jk.shm
++ JkShmFile /var/log/apache2/jk-runtime-status
+
+ # Define a new log format you can use in any CustomLog in order
+ # to add mod_jk specific information to your access log.
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0003-upgrade-info-to-error-message.patch
===================================================================
--- trunk/libapache-mod-jk/debian/patches/0003-upgrade-info-to-error-message.patch 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0003-upgrade-info-to-error-message.patch 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,22 +0,0 @@
-From: Michael Koch <konqueror at gmx.de>
-Date: Sat, 24 Jul 2010 00:26:24 +0200
-Subject: [PATCH] upgrade info to error message
-
----
- native/apache-2.0/mod_jk.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/native/apache-2.0/mod_jk.c b/native/apache-2.0/mod_jk.c
-index 8fa5ad1..e1f5e0c 100644
---- a/native/apache-2.0/mod_jk.c
-+++ b/native/apache-2.0/mod_jk.c
-@@ -2623,7 +2623,7 @@ static int jk_handler(request_rec * r)
- }
- }
- else {
-- jk_log(xconf->log, JK_LOG_INFO, "Could not find a worker"
-+ jk_log(xconf->log, JK_LOG_ERROR, "Could not find a worker"
- " for worker name=%s",
- worker_name);
- JK_TRACE_EXIT(xconf->log);
---
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0003-upgrade-info-to-error-message.patch (from rev 13850, trunk/libapache-mod-jk/debian/patches/0003-upgrade-info-to-error-message.patch)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0003-upgrade-info-to-error-message.patch (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0003-upgrade-info-to-error-message.patch 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1,19 @@
+From: Michael Koch <konqueror at gmx.de>
+Date: Sat, 24 Jul 2010 00:26:24 +0200
+Subject: [PATCH] upgrade info to error message
+
+---
+ native/apache-2.0/mod_jk.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- a/native/apache-2.0/mod_jk.c
++++ b/native/apache-2.0/mod_jk.c
+@@ -2683,7 +2683,7 @@
+ }
+ }
+ else {
+- jk_log(xconf->log, JK_LOG_INFO, "Could not find a worker"
++ jk_log(xconf->log, JK_LOG_ERROR, "Could not find a worker"
+ " for worker name=%s",
+ worker_name);
+ JK_TRACE_EXIT(xconf->log);
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0004-update-config.guess-and-config.sub.patch
===================================================================
--- trunk/libapache-mod-jk/debian/patches/0004-update-config.guess-and-config.sub.patch 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/patches/0004-update-config.guess-and-config.sub.patch 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,1111 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Sat, 24 Jul 2010 00:58:22 +0200
-Subject: [PATCH] update config.guess and config.sub
-
----
- native/scripts/build/unix/config.guess | 303 ++++++++++++++++++--------------
- native/scripts/build/unix/config.sub | 239 ++++++++++++++++++++------
- 2 files changed, 358 insertions(+), 184 deletions(-)
-
-diff --git a/native/scripts/build/unix/config.guess b/native/scripts/build/unix/config.guess
-index 917bbc5..c2246a4 100755
---- a/native/scripts/build/unix/config.guess
-+++ b/native/scripts/build/unix/config.guess
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-+# Free Software Foundation, Inc.
-
--timestamp='2005-07-08'
-+timestamp='2009-12-30'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -26,16 +27,16 @@ timestamp='2005-07-08'
- # the same distribution terms that you use for the rest of that program.
-
-
--# Originally written by Per Bothner <per at bothner.com>.
--# Please send patches to <config-patches at gnu.org>. Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# Originally written by Per Bothner. Please send patches (context
-+# diff format) to <config-patches at gnu.org> and include a ChangeLog
-+# entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub. If it succeeds, it prints the system name on stdout, and
- # exits with 0. Otherwise, it exits with 1.
- #
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit build system type.
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
- me=`echo "$0" | sed -e 's,.*/,,'`
-
-@@ -55,8 +56,9 @@ version="\
- GNU config.guess ($timestamp)
-
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-+Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -106,7 +108,7 @@ set_cc_for_build='
- trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
- trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
- : ${TMPDIR=/tmp} ;
-- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-@@ -160,6 +162,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
-+ sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
-@@ -168,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-- | grep __ELF__ >/dev/null
-+ | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
-@@ -206,8 +209,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
-+ *:SolidBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+ exit ;;
- macppc:MirBSD:*:*)
-- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-@@ -319,14 +325,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
-+ s390x:SunOS:*:*)
-+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-- i86pc:SunOS:5.*:*)
-- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-+ echo i386-pc-auroraux${UNAME_RELEASE}
-+ exit ;;
-+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-+ eval $set_cc_for_build
-+ SUN_ARCH="i386"
-+ # If there is a compiler, see if it is configured for 64-bit objects.
-+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+ # This test works for both compilers.
-+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_64BIT_ARCH >/dev/null
-+ then
-+ SUN_ARCH="x86_64"
-+ fi
-+ fi
-+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
-@@ -527,7 +552,7 @@ EOF
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
-- *:AIX:*:[45])
-+ *:AIX:*:[456])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
-@@ -635,7 +660,7 @@ EOF
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-- grep __LP64__ >/dev/null
-+ grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
-@@ -764,12 +789,19 @@ EOF
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:FreeBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ case ${UNAME_MACHINE} in
-+ pc98)
-+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ amd64)
-+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ *)
-+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ esac
- exit ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
-- i*:MINGW*:*)
-+ *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- i*:windows32*:*)
-@@ -779,12 +811,24 @@ EOF
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
-- x86:Interix*:[34]*)
-- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-- exit ;;
-+ *:Interix*:*)
-+ case ${UNAME_MACHINE} in
-+ x86)
-+ echo i586-pc-interix${UNAME_RELEASE}
-+ exit ;;
-+ authenticamd | genuineintel | EM64T)
-+ echo x86_64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
-+ IA64)
-+ echo ia64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
-+ esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-+ 8664:Windows_NT:*)
-+ echo x86_64-pc-mks
-+ exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -794,7 +838,7 @@ EOF
- i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
- exit ;;
-- amd64:CYGWIN*:*:*)
-+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
- exit ;;
- p*:CYGWIN*:*)
-@@ -814,7 +858,31 @@ EOF
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
-+ alpha:Linux:*:*)
-+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ EV5) UNAME_MACHINE=alphaev5 ;;
-+ EV56) UNAME_MACHINE=alphaev56 ;;
-+ PCA56) UNAME_MACHINE=alphapca56 ;;
-+ PCA57) UNAME_MACHINE=alphapca56 ;;
-+ EV6) UNAME_MACHINE=alphaev6 ;;
-+ EV67) UNAME_MACHINE=alphaev67 ;;
-+ EV68*) UNAME_MACHINE=alphaev68 ;;
-+ esac
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
-+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ exit ;;
- arm*:Linux:*:*)
-+ eval $set_cc_for_build
-+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep -q __ARM_EABI__
-+ then
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ else
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ fi
-+ exit ;;
-+ avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- cris:Linux:*:*)
-@@ -826,6 +894,17 @@ EOF
- frv:Linux:*:*)
- echo frv-unknown-linux-gnu
- exit ;;
-+ i*86:Linux:*:*)
-+ LIBC=gnu
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #ifdef __dietlibc__
-+ LIBC=dietlibc
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+ exit ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-@@ -835,63 +914,33 @@ EOF
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- mips:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
-- #undef mips
-- #undef mipsel
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mipsel
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips
-- #else
-- CPU=
-- #endif
-- #endif
--EOF
-- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-- ;;
-- mips64:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
-- #undef mips64
-- #undef mips64el
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mips64el
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips64
-+ CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
- #endif
- EOF
-- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
-- ppc:Linux:*:*)
-- echo powerpc-unknown-linux-gnu
-+ or32:Linux:*:*)
-+ echo or32-unknown-linux-gnu
- exit ;;
-- ppc64:Linux:*:*)
-- echo powerpc64-unknown-linux-gnu
-+ padre:Linux:*:*)
-+ echo sparc-unknown-linux-gnu
- exit ;;
-- alpha:Linux:*:*)
-- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-- EV5) UNAME_MACHINE=alphaev5 ;;
-- EV56) UNAME_MACHINE=alphaev56 ;;
-- PCA56) UNAME_MACHINE=alphapca56 ;;
-- PCA57) UNAME_MACHINE=alphapca56 ;;
-- EV6) UNAME_MACHINE=alphaev6 ;;
-- EV67) UNAME_MACHINE=alphaev67 ;;
-- EV68*) UNAME_MACHINE=alphaev68 ;;
-- esac
-- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ parisc64:Linux:*:* | hppa64:Linux:*:*)
-+ echo hppa64-unknown-linux-gnu
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
-@@ -901,8 +950,11 @@ EOF
- *) echo hppa-unknown-linux-gnu ;;
- esac
- exit ;;
-- parisc64:Linux:*:* | hppa64:Linux:*:*)
-- echo hppa64-unknown-linux-gnu
-+ ppc64:Linux:*:*)
-+ echo powerpc64-unknown-linux-gnu
-+ exit ;;
-+ ppc:Linux:*:*)
-+ echo powerpc-unknown-linux-gnu
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
-@@ -916,68 +968,15 @@ EOF
- sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-+ vax:Linux:*:*)
-+ echo ${UNAME_MACHINE}-dec-linux-gnu
-+ exit ;;
- x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
- exit ;;
-- i*86:Linux:*:*)
-- # The BFD linker knows what the default object file format is, so
-- # first see if it will tell us. cd to the root directory to prevent
-- # problems with other programs or directories called `ld' in the path.
-- # Set LC_ALL=C to ensure ld outputs messages in English.
-- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-- | sed -ne '/supported targets:/!d
-- s/[ ][ ]*/ /g
-- s/.*supported targets: *//
-- s/ .*//
-- p'`
-- case "$ld_supported_targets" in
-- elf32-i386)
-- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-- ;;
-- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-- exit ;;
-- coff-i386)
-- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-- exit ;;
-- "")
-- # Either a pre-BFD a.out linker (linux-gnuoldld) or
-- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-- exit ;;
-- esac
-- # Determine whether the default compiler is a.out or elf
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #include <features.h>
-- #ifdef __ELF__
-- # ifdef __GLIBC__
-- # if __GLIBC__ >= 2
-- LIBC=gnu
-- # else
-- LIBC=gnulibc1
-- # endif
-- # else
-- LIBC=gnulibc1
-- # endif
-- #else
-- #ifdef __INTEL_COMPILER
-- LIBC=gnu
-- #else
-- LIBC=gnuaout
-- #endif
-- #endif
-- #ifdef __dietlibc__
-- LIBC=dietlibc
-- #endif
--EOF
-- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-- test x"${LIBC}" != x && {
-- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-- exit
-- }
-- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-- ;;
-+ xtensa*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- # earlier versions are messed up and put the nodename in both
-@@ -1006,7 +1005,7 @@ EOF
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
-- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
-@@ -1050,8 +1049,11 @@ EOF
- pc:*:*:*)
- # Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
-- # the processor, so we play safe by assuming i386.
-- echo i386-pc-msdosdjgpp
-+ # the processor, so we play safe by assuming i586.
-+ # Note: whatever this is, it MUST be the same as what config.sub
-+ # prints for the "djgpp" host, or else GDB configury will decide that
-+ # this is a cross-build.
-+ echo i586-pc-msdosdjgpp
- exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
-@@ -1089,6 +1091,16 @@ EOF
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
-+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+ OS_REL='.3'
-+ test -r /etc/.relid \
-+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-@@ -1101,7 +1113,7 @@ EOF
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
-@@ -1164,6 +1176,9 @@ EOF
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
- exit ;;
-+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
-+ echo i586-pc-haiku
-+ exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
- exit ;;
-@@ -1173,6 +1188,15 @@ EOF
- SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
- exit ;;
-+ SX-7:SUPER-UX:*:*)
-+ echo sx7-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8:SUPER-UX:*:*)
-+ echo sx8-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8R:SUPER-UX:*:*)
-+ echo sx8r-nec-superux${UNAME_RELEASE}
-+ exit ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
-@@ -1182,7 +1206,16 @@ EOF
- *:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
-- *86) UNAME_PROCESSOR=i686 ;;
-+ i386)
-+ eval $set_cc_for_build
-+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_64BIT_ARCH >/dev/null
-+ then
-+ UNAME_PROCESSOR="x86_64"
-+ fi
-+ fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-@@ -1261,6 +1294,12 @@ EOF
- i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
- exit ;;
-+ i*86:rdos:*:*)
-+ echo ${UNAME_MACHINE}-pc-rdos
-+ exit ;;
-+ i*86:AROS:*:*)
-+ echo ${UNAME_MACHINE}-pc-aros
-+ exit ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1421,9 +1460,9 @@ This script, last modified $timestamp, has failed to recognize
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
-
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- and
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
-diff --git a/native/scripts/build/unix/config.sub b/native/scripts/build/unix/config.sub
-index 1c366df..c2d1257 100755
---- a/native/scripts/build/unix/config.sub
-+++ b/native/scripts/build/unix/config.sub
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-+# Free Software Foundation, Inc.
-
--timestamp='2005-07-08'
-+timestamp='2010-01-22'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -31,13 +32,16 @@ timestamp='2005-07-08'
-
-
- # Please send patches to <config-patches at gnu.org>. Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# diff and a properly formatted GNU ChangeLog entry.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
- # Otherwise, we print the canonical config type on stdout and succeed.
-
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
- # that are meaningful with *any* GNU software.
-@@ -71,8 +75,9 @@ Report bugs and patches to <config-patches at gnu.org>."
- version="\
- GNU config.sub ($timestamp)
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-+Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -119,8 +124,10 @@ esac
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+ kopensolaris*-gnu* | \
-+ storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
-@@ -146,10 +153,13 @@ case $os in
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-- -apple | -axis | -knuth | -cray)
-+ -apple | -axis | -knuth | -cray | -microblaze)
- os=
- basic_machine=$1
- ;;
-+ -bluegene*)
-+ os=-cnk
-+ ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
-@@ -171,6 +181,10 @@ case $os in
- -hiux*)
- os=-hiuxwe2
- ;;
-+ -sco6)
-+ os=-sco5v6
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
- -sco5)
- os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -187,6 +201,10 @@ case $os in
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-+ -sco5v6*)
-+ # Don't forget version if it is 3.2v4 or newer.
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
- -sco*)
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -231,20 +249,24 @@ case $basic_machine in
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | bfin \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
-- | fr30 | frv \
-+ | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-+ | lm32 \
-+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
-+ | maxq | mb | microblaze | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-- | mips64vr | mips64vrel \
-+ | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
-+ | mips64r5900 | mips64r5900el \
-+ | mips64vr | mips64vrel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
-@@ -257,35 +279,40 @@ case $basic_machine in
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
-- | ms1 \
-+ | moxie \
-+ | mt \
- | msp430 \
-+ | nios | nios2 \
- | ns16k | ns32k \
- | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
-- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | rx \
-+ | score \
-+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
-- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-- | sparcv8 | sparcv9 | sparcv9b \
-- | strongarm \
-+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+ | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
-+ | ubicom32 \
- | v850 | v850e \
- | we32k \
-- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-- | z8k)
-- basic_machine=$basic_machine-unknown
-- ;;
-- m32c)
-+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
-- m6811 | m68hc11 | m6812 | m68hc12)
-+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- ;;
-+ ms1)
-+ basic_machine=mt-unknown
-+ ;;
-
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
-@@ -305,25 +332,28 @@ case $basic_machine in
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-- | avr-* \
-+ | avr-* | avr32-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
-- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-- | m32r-* | m32rle-* \
-+ | lm32-* \
-+ | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-- | m88110-* | m88k-* | maxq-* | mcore-* \
-+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
-- | mips64vr-* | mips64vrel-* \
-+ | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
-+ | mips64r5900-* | mips64r5900el-* \
-+ | mips64vr-* | mips64vrel-* \
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
-@@ -336,30 +366,35 @@ case $basic_machine in
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipstx39-* | mipstx39el-* \
- | mmix-* \
-- | ms1-* \
-+ | mt-* \
- | msp430-* \
-+ | nios-* | nios2-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
-- | romp-* | rs6000-* \
-- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+ | romp-* | rs6000-* | rx-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
-- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tile-* | tilegx-* \
- | tron-* \
-+ | ubicom32-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-- | xstormy16-* | xtensa-* \
-+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | xstormy16-* | xtensa*-* \
- | ymp-* \
-- | z8k-*)
-+ | z8k-* | z80-*)
- ;;
-- m32c-*)
-+ # Recognize the basic CPU types without company name, with glob match.
-+ xtensa*)
-+ basic_machine=$basic_machine-unknown
- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
-@@ -423,6 +458,10 @@ case $basic_machine in
- basic_machine=m68k-apollo
- os=-bsd
- ;;
-+ aros)
-+ basic_machine=i386-pc
-+ os=-aros
-+ ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
-@@ -431,10 +470,26 @@ case $basic_machine in
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
-+ blackfin)
-+ basic_machine=bfin-unknown
-+ os=-linux
-+ ;;
-+ blackfin-*)
-+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ os=-linux
-+ ;;
-+ bluegene*)
-+ basic_machine=powerpc-ibm
-+ os=-cnk
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- ;;
-+ cegcc)
-+ basic_machine=arm-unknown
-+ os=-cegcc
-+ ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
-@@ -463,8 +518,8 @@ case $basic_machine in
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
-- cr16c)
-- basic_machine=cr16c-unknown
-+ cr16)
-+ basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
-@@ -502,6 +557,10 @@ case $basic_machine in
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
-+ dicos)
-+ basic_machine=i686-pc
-+ os=-dicos
-+ ;;
- djgpp)
- basic_machine=i586-pc
- os=-msdosdjgpp
-@@ -656,6 +715,14 @@ case $basic_machine in
- basic_machine=m68k-isi
- os=-sysv
- ;;
-+ m68knommu)
-+ basic_machine=m68k-unknown
-+ os=-linux
-+ ;;
-+ m68knommu-*)
-+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ os=-linux
-+ ;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
-@@ -667,10 +734,17 @@ case $basic_machine in
- basic_machine=ns32k-utek
- os=-sysv
- ;;
-+ microblaze)
-+ basic_machine=microblaze-xilinx
-+ ;;
- mingw32)
- basic_machine=i386-pc
- os=-mingw32
- ;;
-+ mingw32ce)
-+ basic_machine=arm-unknown
-+ os=-mingw32ce
-+ ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
-@@ -696,6 +770,9 @@ case $basic_machine in
- basic_machine=i386-pc
- os=-msdos
- ;;
-+ ms1-*)
-+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+ ;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
-@@ -794,6 +871,14 @@ case $basic_machine in
- basic_machine=i860-intel
- os=-osf
- ;;
-+ parisc)
-+ basic_machine=hppa-unknown
-+ os=-linux
-+ ;;
-+ parisc-*)
-+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ os=-linux
-+ ;;
- pbd)
- basic_machine=sparc-tti
- ;;
-@@ -803,6 +888,12 @@ case $basic_machine in
- pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
-+ pc98)
-+ basic_machine=i386-pc
-+ ;;
-+ pc98-*)
-+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
-@@ -859,6 +950,10 @@ case $basic_machine in
- basic_machine=i586-unknown
- os=-pw32
- ;;
-+ rdos)
-+ basic_machine=i386-pc
-+ os=-rdos
-+ ;;
- rom68k)
- basic_machine=m68k-rom68k
- os=-coff
-@@ -885,6 +980,10 @@ case $basic_machine in
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
-+ sde)
-+ basic_machine=mipsisa32-sde
-+ os=-elf
-+ ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
-@@ -896,6 +995,9 @@ case $basic_machine in
- basic_machine=sh-hitachi
- os=-hms
- ;;
-+ sh5el)
-+ basic_machine=sh5le-unknown
-+ ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
-@@ -985,6 +1087,15 @@ case $basic_machine in
- basic_machine=tic6x-unknown
- os=-coff
- ;;
-+ # This must be matched before tile*.
-+ tilegx*)
-+ basic_machine=tilegx-unknown
-+ os=-linux-gnu
-+ ;;
-+ tile*)
-+ basic_machine=tile-unknown
-+ os=-linux-gnu
-+ ;;
- tx39)
- basic_machine=mipstx39-unknown
- ;;
-@@ -1060,6 +1171,10 @@ case $basic_machine in
- basic_machine=z8k-unknown
- os=-sim
- ;;
-+ z80-*-coff)
-+ basic_machine=z80-unknown
-+ os=-sim
-+ ;;
- none)
- basic_machine=none-none
- os=-none
-@@ -1098,10 +1213,10 @@ case $basic_machine in
- we32k)
- basic_machine=we32k-att
- ;;
-- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
-- sparc | sparcv8 | sparcv9 | sparcv9b)
-+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
- cydra)
-@@ -1148,6 +1263,9 @@ case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
- # -solaris* is a basic system type, with this one exception.
-+ -auroraux)
-+ os=-auroraux
-+ ;;
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
- ;;
-@@ -1168,27 +1286,30 @@ case $os in
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-+ | -sym* | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-- | -aos* \
-+ | -aos* | -aros* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+ | -openbsd* | -solidbsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-- | -chorusos* | -chorusrdb* \
-+ | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+ | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku*)
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-@@ -1318,6 +1439,11 @@ case $os in
- -zvmoe)
- os=-zvmoe
- ;;
-+ -dicos*)
-+ os=-dicos
-+ ;;
-+ -nacl*)
-+ ;;
- -none)
- ;;
- *)
-@@ -1340,6 +1466,12 @@ else
- # system, and we'll never get to this point.
-
- case $basic_machine in
-+ score-*)
-+ os=-elf
-+ ;;
-+ spu-*)
-+ os=-elf
-+ ;;
- *-acorn)
- os=-riscix1.2
- ;;
-@@ -1349,9 +1481,9 @@ case $basic_machine in
- arm*-semi)
- os=-aout
- ;;
-- c4x-* | tic4x-*)
-- os=-coff
-- ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
-@@ -1377,6 +1509,9 @@ case $basic_machine in
- m68*-cisco)
- os=-aout
- ;;
-+ mep-*)
-+ os=-elf
-+ ;;
- mips*-cisco)
- os=-elf
- ;;
-@@ -1506,7 +1641,7 @@ case $basic_machine in
- -sunos*)
- vendor=sun
- ;;
-- -aix*)
-+ -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
---
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/patches/series
===================================================================
--- trunk/libapache-mod-jk/debian/patches/series 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/patches/series 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,4 +0,0 @@
-0001-disable-logo.patch
-0002-debianize-log-directory.patch
-0003-upgrade-info-to-error-message.patch
-0004-update-config.guess-and-config.sub.patch
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/patches/series (from rev 13850, trunk/libapache-mod-jk/debian/patches/series)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/patches/series (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/patches/series 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1,3 @@
+0001-disable-logo.patch
+0002-debianize-log-directory.patch
+0003-upgrade-info-to-error-message.patch
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/rules
===================================================================
--- trunk/libapache-mod-jk/debian/rules 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/rules 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,110 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- cp -a native native-apache2
-
- touch build-stamp
-
-
-build-apache20:
- dh_testdir
-# -$(MAKE) -C native clean
- 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:
- 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/miscellaneous && lynx -dump -nolist changelog.html > ../changelog
-
-
-## -------- CLEAN TARGETS
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- rm -f native/common/portable.h native/common/stamp-h1
- rm -rf build
- 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-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-2.0/.libs native/common/.libs
- rm -rf native-apache2
- dh_clean
-
-
-install: install-indep install-arch
-install-indep:
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs -i
- dh_install -i
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs -a
- cp native-apache2/apache-2.0/mod_jk.so debian/libapache2-mod-jk/usr/lib/apache2/modules/mod_jk.so
- dh_install -a
-
-
-# Build architecture-independent files here.
-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
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build build-apache20 install-arch
- dh_testdir -a
- dh_testroot -a
- dh_installchangelogs -a
- dh_installdocs -a
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- 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
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/rules (from rev 13850, trunk/libapache-mod-jk/debian/rules)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/rules (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/rules 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1,45 @@
+#!/usr/bin/make -f
+
+# Enable LFS
+CFLAGS = -D_LARGEFILE_SUPPORT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+
+%:
+ dh $@ --with autotools_dev --sourcedirectory=native
+
+override_dh_auto_configure:
+ cd native && ./configure --with-apxs=/usr/bin/apxs2
+ sed -i -e 's/^LIBTOOL = .*$$/LIBTOOL = \/bin\/sh ..\/libtool/' native/common/Makefile
+
+override_dh_auto_build:
+ $(MAKE) -C native
+ cp conf/httpd-jk.conf conf/jk.conf
+
+override_dh_auto_clean:
+ rm -f conf/jk.conf
+ # ac_config_files
+ rm -f Makefile apache-1.3/Makefile apache-1.3/Makefile.apxs \
+ apache-2.0/Makefile apache-2.0/Makefile.apxs common/Makefile \
+ common/list.mk common/jk_types.h jni/Makefile
+ # MAINTAINERCLEANFILES
+ rm -f native/config.{status,log,cache}
+ rm -f native/apache-2.0/mod_jk.{o,la,lo,a} native/apache-2.0/mod_jk.so*
+ rm -f native/common/*.{lo,o}
+ rm -rf native/apache-2.0/.libs native/common/.libs
+
+override_dh_auto_install:
+ifneq (,$(filter libapache-mod-jk-doc, $(shell dh_listpackages)))
+ 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/miscellaneous && lynx -dump -nolist changelog.html > ../changelog
+endif
+
+override_dh_compress:
+ dh_compress -Xchangelog.html
+
+# No check target
+override_dh_auto_test:
+
+get-orig-source:
+ uscan --force-download --rename
Deleted: tags/libapache-mod-jk/1:1.2.32-1/debian/watch
===================================================================
--- trunk/libapache-mod-jk/debian/watch 2011-07-07 04:02:04 UTC (rev 13841)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/watch 2011-07-13 23:24:48 UTC (rev 13851)
@@ -1,2 +0,0 @@
-version=2
-http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-(.*)/tomcat-connectors-(.*)-src\.tar\.gz debian uupdate
Copied: tags/libapache-mod-jk/1:1.2.32-1/debian/watch (from rev 13850, trunk/libapache-mod-jk/debian/watch)
===================================================================
--- tags/libapache-mod-jk/1:1.2.32-1/debian/watch (rev 0)
+++ tags/libapache-mod-jk/1:1.2.32-1/debian/watch 2011-07-13 23:24:48 UTC (rev 13851)
@@ -0,0 +1,2 @@
+version=3
+http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-(.*)-src\.tar\.gz debian uupdate
More information about the pkg-java-commits
mailing list