This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository libapache-mod-jk.

commit 884583b33f2ab2350af07c05e551d90d59e178f2
Author: Torsten Werner <[email protected]>
Date:   Fri Jul 23 22:43:37 2010 +0000

    UNRELEASED
    * Team upload
    * New upstream release
    * Convert patches to dep3 format.
    * Switch to source format 3.0.
---
 debian/changelog                                   |  10 +
 debian/control                                     |   2 +-
 ...02_style_xsl.dpatch => 0001-disable-logo.patch} |  21 +-
 ...n.dpatch => 0002-debianize-log-directory.patch} |  19 +-
 .../0003-upgrade-info-to-error-message.patch       |  22 +
 debian/patches/00list                              |   4 -
 debian/patches/01_stylesheet.dpatch                |  33 -
 debian/patches/04_no-worker-error.dpatch           |  19 -
 debian/patches/05_config_update.dpatch             | 848 ---------------------
 debian/patches/series                              |   3 +
 debian/rules                                       |  14 +-
 debian/source/format                               |   1 +
 12 files changed, 62 insertions(+), 934 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f495f1..63b8f7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libapache-mod-jk (1:1.2.30-1) unstable; urgency=low
+
+  UNRELEASED
+  * Team upload
+  * New upstream release
+  * Convert patches to dep3 format.
+  * Switch to source format 3.0.
+
+ -- Torsten Werner <[email protected]>  Sat, 24 Jul 2010 00:39:42 +0200
+
 libapache-mod-jk (1:1.2.28-2) unstable; urgency=low
 
   * Added debian/patches/05_config_update.dpatch which updates
diff --git a/debian/control b/debian/control
index f42bf72..2538af3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Debian Java Maintainers 
<[email protected]>
 Uploaders: Stefan Gybas <[email protected]>, Arnaud Vandyck 
<[email protected]>, Michael Koch <[email protected]>
-Build-Depends: debhelper (>= 5), dpatch, apache2-threaded-dev, libtool
+Build-Depends: debhelper (>= 5), apache2-threaded-dev, libtool
 Build-Depends-Indep: xsltproc, lynx
 Standards-Version: 3.8.3
 Homepage: http://tomcat.apache.org/
diff --git a/debian/patches/02_style_xsl.dpatch 
b/debian/patches/0001-disable-logo.patch
similarity index 67%
rename from debian/patches/02_style_xsl.dpatch
rename to debian/patches/0001-disable-logo.patch
index 13f208b..d2d2a8c 100644
--- a/debian/patches/02_style_xsl.dpatch
+++ b/debian/patches/0001-disable-logo.patch
@@ -1,14 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_style_xsl.dpatch by Arnaud Vandyck <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: commented some errors in the stylesheet
+From: Arnaud Vandyck <[email protected]>
+Date: Sat, 24 Jul 2010 00:26:16 +0200
+Subject: [PATCH] disable logo
 
-@DPATCH@
+---
+ xdocs/style.xsl |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
 
---- ./xdocs/style.xsl~ 2006-06-28 23:56:49.000000000 +0000
-+++ ./xdocs/style.xsl  2006-08-02 12:59:51.000000000 +0000
-@@ -77,15 +77,15 @@
+diff --git a/xdocs/style.xsl b/xdocs/style.xsl
+index 4c44431..fabfd91 100644
+--- a/xdocs/style.xsl
++++ b/xdocs/style.xsl
+@@ -93,15 +93,15 @@
            <img src="{$src}" align="left" alt="{$alt}" border="0"/>
          </a>
          <xsl:if test="project/logo">
@@ -28,3 +30,4 @@
  
            <xsl:comment>APACHE LOGO</xsl:comment>
            <a href="http://www.apache.org/";>
+-- 
diff --git a/debian/patches/03_jk-runtime-status_default_location.dpatch 
b/debian/patches/0002-debianize-log-directory.patch
similarity index 55%
rename from debian/patches/03_jk-runtime-status_default_location.dpatch
rename to debian/patches/0002-debianize-log-directory.patch
index 2e84f0c..e573db7 100644
--- a/debian/patches/03_jk-runtime-status_default_location.dpatch
+++ b/debian/patches/0002-debianize-log-directory.patch
@@ -1,13 +1,15 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_jk-runtime-statuts_default_location.dpatch by Arnaud Vandyck 
<[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: commented some errors in the stylesheet
+From: Arnaud Vandyck <[email protected]>
+Date: Sat, 24 Jul 2010 00:26:20 +0200
+Subject: [PATCH] debianize log directory
 
-@DPATCH@
+---
+ native/apache-2.0/mod_jk.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
 
---- ./native/apache-2.0/mod_jk.c~      2006-07-08 07:57:31.000000000 +0000
-+++ ./native/apache-2.0/mod_jk.c       2006-10-09 08:19:21.000000000 +0000
+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"
@@ -19,3 +21,4 @@
  #define JK_ENV_REMOTE_ADDR          ("JK_REMOTE_ADDR")
  #define JK_ENV_REMOTE_HOST          ("JK_REMOTE_HOST")
  #define JK_ENV_REMOTE_USER          ("JK_REMOTE_USER")
+-- 
diff --git a/debian/patches/0003-upgrade-info-to-error-message.patch 
b/debian/patches/0003-upgrade-info-to-error-message.patch
new file mode 100644
index 0000000..32eab2b
--- /dev/null
+++ b/debian/patches/0003-upgrade-info-to-error-message.patch
@@ -0,0 +1,22 @@
+From: Michael Koch <[email protected]>
+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);
+-- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 49284b2..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-02_style_xsl
-03_jk-runtime-status_default_location.dpatch
-04_no-worker-error.dpatch
-05_config_update
diff --git a/debian/patches/01_stylesheet.dpatch 
b/debian/patches/01_stylesheet.dpatch
deleted file mode 100755
index 2aa5ca2..0000000
--- a/debian/patches/01_stylesheet.dpatch
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_stylesheet.dpatch by  <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: alters variable name so they don't redefine existing ones
-
-@DPATCH@
-
---- ./jk/xdocs/style.xsl       2005-06-25 15:34:30.000000000 +0200
-+++ ./jk/xdocs/style.xsl       2005-06-25 18:07:57.000000000 +0200
-@@ -77,19 +77,19 @@
-           <img src="{$src}" align="left" alt="{$alt}" border="0"/>
-         </a>
-         <xsl:if test="project/logo">
--          <xsl:variable name="alt">
-+          <xsl:variable name="alt2">
-             <xsl:value-of select="project/logo"/>
-           </xsl:variable>
-           <xsl:variable name="home">
-             <xsl:value-of select="project/@href"/>
-           </xsl:variable>
--          <xsl:variable name="src">
-+          <xsl:variable name="src2">
-             <xsl:value-of select="$relative-path"/><xsl:value-of 
select="project/logo/@href"/>
-           </xsl:variable>
- 
-           <xsl:comment>PROJECT LOGO</xsl:comment>
-           <a href="{$home}">
--            <img src="{$src}" align="right" alt="{$alt}" border="0"/>
-+            <img src="{$src2}" align="right" alt="{$alt2}" border="0"/>
-           </a>
-         </xsl:if>
- 
diff --git a/debian/patches/04_no-worker-error.dpatch 
b/debian/patches/04_no-worker-error.dpatch
deleted file mode 100644
index 4f7c25c..0000000
--- a/debian/patches/04_no-worker-error.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_no-worker-error.dpatch by Michael Koch <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: commented some errors in the stylesheet
-
-@DPATCH@
-
---- ./native/apache-2.0/mod_jk.c~      2007-04-17 08:04:47.000000000 +0200
-+++ ./native/apache-2.0/mod_jk.c       2007-04-17 08:05:12.000000000 +0200
-@@ -2259,7 +2259,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);
diff --git a/debian/patches/05_config_update.dpatch 
b/debian/patches/05_config_update.dpatch
deleted file mode 100755
index 61de23d..0000000
--- a/debian/patches/05_config_update.dpatch
+++ /dev/null
@@ -1,848 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_config_update.dpatch by Michael Koch <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: update config.{guess|sub} for newer archs like kfreebsd-*.
-
-@DPATCH@
-
---- libapache-mod-jk-1.2.28.orig/native/scripts/build/unix/config.sub
-+++ libapache-mod-jk-1.2.28/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
-+#   Free Software Foundation, Inc.
- 
--timestamp='2005-12-11'
-+timestamp='2009-06-11'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -71,8 +72,8 @@
- 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 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."
-@@ -121,6 +122,7 @@
- case $maybe_os in
-   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/'`
-@@ -151,6 +153,9 @@
-               os=
-               basic_machine=$1
-               ;;
-+        -bluegene*)
-+              os=-cnk
-+              ;;
-       -sim | -cisco | -oki | -wec | -winbond)
-               os=
-               basic_machine=$1
-@@ -240,20 +245,24 @@
-       | 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 \
-@@ -266,26 +275,26 @@
-       | mipsisa64sr71k | mipsisa64sr71kel \
-       | mipstx39 | mipstx39el \
-       | mn10200 | mn10300 \
-+      | 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 \
-+      | 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 \
-       | 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)
-@@ -317,25 +326,28 @@
-       | 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-* \
-       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-       | mips16-* \
-       | mips64-* | mips64el-* \
--      | mips64vr-* | mips64vrel-* \
-+      | mips64octeon-* | mips64octeonel-* \
-       | mips64orion-* | mips64orionel-* \
-+      | mips64r5900-* | mips64r5900el-* \
-+      | mips64vr-* | mips64vrel-* \
-       | mips64vr4100-* | mips64vr4100el-* \
-       | mips64vr4300-* | mips64vr4300el-* \
-       | mips64vr5000-* | mips64vr5000el-* \
-@@ -350,28 +362,31 @@
-       | mmix-* \
-       | 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-* \
-+      | 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-* \
-+      | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-       | tron-* \
-       | 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.
-@@ -435,6 +450,10 @@
-               basic_machine=m68k-apollo
-               os=-bsd
-               ;;
-+      aros)
-+              basic_machine=i386-pc
-+              os=-aros
-+              ;;
-       aux)
-               basic_machine=m68k-apple
-               os=-aux
-@@ -443,10 +462,26 @@
-               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
-@@ -475,8 +510,8 @@
-               basic_machine=craynv-cray
-               os=-unicosmp
-               ;;
--      cr16c)
--              basic_machine=cr16c-unknown
-+      cr16)
-+              basic_machine=cr16-unknown
-               os=-elf
-               ;;
-       crds | unos)
-@@ -514,6 +549,10 @@
-               basic_machine=m88k-motorola
-               os=-sysv3
-               ;;
-+      dicos)
-+              basic_machine=i686-pc
-+              os=-dicos
-+              ;;
-       djgpp)
-               basic_machine=i586-pc
-               os=-msdosdjgpp
-@@ -668,6 +707,14 @@
-               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
-               ;;
-@@ -683,6 +730,10 @@
-               basic_machine=i386-pc
-               os=-mingw32
-               ;;
-+      mingw32ce)
-+              basic_machine=arm-unknown
-+              os=-mingw32ce
-+              ;;
-       miniframe)
-               basic_machine=m68000-convergent
-               ;;
-@@ -809,6 +860,14 @@
-               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
-               ;;
-@@ -818,6 +877,12 @@
-       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
-               ;;
-@@ -904,6 +969,10 @@
-       sb1el)
-               basic_machine=mipsisa64sb1el-unknown
-               ;;
-+      sde)
-+              basic_machine=mipsisa32-sde
-+              os=-elf
-+              ;;
-       sei)
-               basic_machine=mips-sei
-               os=-seiux
-@@ -915,6 +984,9 @@
-               basic_machine=sh-hitachi
-               os=-hms
-               ;;
-+      sh5el)
-+              basic_machine=sh5le-unknown
-+              ;;
-       sh64)
-               basic_machine=sh64-unknown
-               ;;
-@@ -1004,6 +1076,10 @@
-               basic_machine=tic6x-unknown
-               os=-coff
-               ;;
-+      tile*)
-+              basic_machine=tile-unknown
-+              os=-linux-gnu
-+              ;;
-       tx39)
-               basic_machine=mipstx39-unknown
-               ;;
-@@ -1079,6 +1155,10 @@
-               basic_machine=z8k-unknown
-               os=-sim
-               ;;
-+      z80-*-coff)
-+              basic_machine=z80-unknown
-+              os=-sim
-+              ;;
-       none)
-               basic_machine=none-none
-               os=-none
-@@ -1117,10 +1197,10 @@
-       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)
-@@ -1187,18 +1267,20 @@
-       # 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]*\
-+            | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | 
-sunos[34]*\
-             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -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-newlib* | -linux-uclibc* \
-             | -uxpv* | -beos* | -mpeix* | -udk* \
-@@ -1208,7 +1290,7 @@
-             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--            | -skyos* | -haiku* | -rdos*)
-+            | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-       # Remember, each alternative MUST END IN *, to match a version number.
-               ;;
-       -qnx*)
-@@ -1338,6 +1420,9 @@
-       -zvmoe)
-               os=-zvmoe
-               ;;
-+      -dicos*)
-+              os=-dicos
-+              ;;
-       -none)
-               ;;
-       *)
-@@ -1360,6 +1445,12 @@
- # system, and we'll never get to this point.
- 
- case $basic_machine in
-+        score-*)
-+              os=-elf
-+              ;;
-+        spu-*)
-+              os=-elf
-+              ;;
-       *-acorn)
-               os=-riscix1.2
-               ;;
-@@ -1369,9 +1460,9 @@
-       arm*-semi)
-               os=-aout
-               ;;
--    c4x-* | tic4x-*)
--        os=-coff
--        ;;
-+        c4x-* | tic4x-*)
-+              os=-coff
-+              ;;
-       # This must come before the *-dec entry.
-       pdp10-*)
-               os=-tops20
-@@ -1397,6 +1488,9 @@
-       m68*-cisco)
-               os=-aout
-               ;;
-+        mep-*)
-+              os=-elf
-+              ;;
-       mips*-cisco)
-               os=-elf
-               ;;
-@@ -1526,7 +1620,7 @@
-                       -sunos*)
-                               vendor=sun
-                               ;;
--                      -aix*)
-+                      -cnk*|-aix*)
-                               vendor=ibm
-                               ;;
-                       -beos*)
---- libapache-mod-jk-1.2.28.orig/native/scripts/build/unix/config.guess
-+++ libapache-mod-jk-1.2.28/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
-+#   Free Software Foundation, Inc.
- 
--timestamp='2005-12-13'
-+timestamp='2009-06-10'
- 
- # 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
-@@ -55,8 +56,8 @@
- 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 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 +107,7 @@
- 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 +161,7 @@
-           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 +170,7 @@
-           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 +208,11 @@
-     *: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 +324,30 @@
-       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: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 +548,7 @@
-               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 +656,7 @@
-           # => 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 +785,19 @@
-       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 +807,24 @@
-     i*:PW*:*)
-       echo ${UNAME_MACHINE}-pc-pw32
-       exit ;;
--    x86:Interix*:[345]*)
--      echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
--      exit ;;
-+    *:Interix*:[3456]*)
-+      case ${UNAME_MACHINE} in
-+          x86)
-+              echo i586-pc-interix${UNAME_RELEASE}
-+              exit ;;
-+          EM64T | authenticamd | genuineintel)
-+              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
-@@ -815,6 +855,16 @@
-       echo ${UNAME_MACHINE}-pc-minix
-       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:*:*)
-@@ -835,42 +885,27 @@
-     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 | sed -n '/^CPU/{s: 
::g;p;}'`"
--      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 | sed -n '/^CPU/{s: 
::g;p;}'`"
-+      eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+          /^CPU/{
-+              s: ::g
-+              p
-+          }'`"
-       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-       ;;
-     or32:Linux:*:*)
-@@ -892,10 +927,13 @@
-         EV67)  UNAME_MACHINE=alphaev67 ;;
-         EV68*) UNAME_MACHINE=alphaev68 ;;
-         esac
--      objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+      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 ;;
-+    padre:Linux:*:*)
-+      echo sparc-unknown-linux-gnu
-+      exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
-       # Look for CPU level
-       case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -925,6 +963,9 @@
-     x86_64:Linux:*:*)
-       echo x86_64-unknown-linux-gnu
-       exit ;;
-+    xtensa*:Linux:*:*)
-+      echo ${UNAME_MACHINE}-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
-@@ -940,17 +981,6 @@
-         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
-@@ -967,7 +997,7 @@
-       LIBC=gnulibc1
-       # endif
-       #else
--      #if defined(__INTEL_COMPILER) || defined(__PGI)
-+      #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) 
|| defined(__SUNPRO_CC)
-       LIBC=gnu
-       #else
-       LIBC=gnuaout
-@@ -977,7 +1007,11 @@
-       LIBC=dietlibc
-       #endif
- EOF
--      eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: 
::g;p;}'`"
-+      eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+          /^LIBC/{
-+              s: ::g
-+              p
-+          }'`"
-       test x"${LIBC}" != x && {
-               echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-               exit
-@@ -1012,7 +1046,7 @@
-     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:*:*)
-@@ -1056,8 +1090,11 @@
-     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
-@@ -1095,6 +1132,16 @@
-     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 ;;
-@@ -1107,7 +1154,7 @@
-     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:*:*)
-@@ -1170,6 +1217,9 @@
-     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 ;;
-@@ -1179,6 +1229,15 @@
-     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 ;;
-@@ -1269,6 +1328,9 @@
-     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
-@@ -1429,9 +1491,9 @@
- 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/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3b6be9c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-disable-logo.patch
+0002-debianize-log-directory.patch
+0003-upgrade-info-to-error-message.patch
diff --git a/debian/rules b/debian/rules
index 24a94d6..d7ae7dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
 
-build: patch build-stamp
+build: build-stamp
 build-stamp:  
        dh_testdir
        
@@ -40,8 +40,7 @@ build-doc:
 
 
 ## -------- CLEAN TARGETS
-clean: clean-patched unpatch
-clean-patched:
+clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp 
@@ -78,15 +77,6 @@ install-arch:
        dh_install -a
 
 
-patch: patch-stamp
-patch-stamp:
-       dpatch apply-all
-       touch patch-stamp
-
-unpatch:
-       dpatch deapply-all
-       rm -rf patch-stamp debian/patched
-
 # Build architecture-independent files here.
 binary-indep: build-doc install-indep  
        dh_testdir -i 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/libapache-mod-jk.git

_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to