--- javax-servletapi2.3-4.0.orig/debian/libservlet2.3-java.docs
+++ javax-servletapi2.3-4.0/debian/libservlet2.3-java.docs
@@ -0,0 +1 @@
+dist/docs/api
--- javax-servletapi2.3-4.0.orig/debian/rules
+++ javax-servletapi2.3-4.0/debian/rules
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+JAVA_HOME := /usr/lib/jvm/java-gcj
+ANT_HOME := /usr/share/ant
+
+DEB_ANT_BUILD_TARGET := dist
+
+install/libservlet2.3-java::
+ install -m 644 -D dist/lib/servlet.jar debian/libservlet2.3-java/usr/share/java/servlet-2.3.jar
--- javax-servletapi2.3-4.0.orig/debian/control
+++ javax-servletapi2.3-4.0/debian/control
@@ -0,0 +1,21 @@
+Source: javax-servletapi2.3
+Section: libs
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Arnaud Vandyck <avdyk@debian.org>, Michael Koch <konqueror@gmx.de>
+Build-Depends: debhelper (>= 5), cdbs
+Build-Depends-Indep: ant, java-gcj-compat-dev
+Standards-Version: 3.7.2
+
+Package: libservlet2.3-java
+Architecture: all
+Section: libs
+Priority: optional
+Depends: java-gcj-compat | java1-runtime | java2-runtime
+Description: Servlet 2.3 and JSP 1.2 Java classes and documentation
+ .
+ For more information about Java servlets please take a look at the Tomcat
+ home page at http://jakarta.apache.org/tomcat/index.html.
+ .
+ The official Servlet 2.3 and JSP 1.2 specifications can be found at
+ http://java.sun.com/products/servlet/ and http://java.sun.com/products/jsp/.
--- javax-servletapi2.3-4.0.orig/debian/compat
+++ javax-servletapi2.3-4.0/debian/compat
@@ -0,0 +1 @@
+5
--- javax-servletapi2.3-4.0.orig/debian/changelog
+++ javax-servletapi2.3-4.0/debian/changelog
@@ -0,0 +1,103 @@
+javax-servletapi2.3 (4.0-10) unstable; urgency=low
+
+ * Fixed Depends on java-gcj-compat.
+
+ -- Michael Koch <konqueror@gmx.de> Sun, 28 Oct 2007 09:15:59 +0100
+
+javax-servletapi2.3 (4.0-9) unstable; urgency=low
+
+ * Use CDBS. Invokes ant differently. Closes: #445703.
+ * Use java-gcj-compat instead of kaffe.
+ * Moved debhelper from Build-Depends-Indep to Build-Depends.
+ * Added cdbs to Build-Depends.
+ * Updated debhelper level to 5.
+ * Removed Wolfgang and added myself to Uploaders.
+ * Updated Standards-Version.
+
+ -- Michael Koch <konqueror@gmx.de> Tue, 09 Oct 2007 23:15:44 +0200
+
+javax-servletapi2.3 (4.0-8) unstable; urgency=low
+
+ * kaffe compiler transition
+ * Standards-Version 3.6.2 (no changes)
+ * Only Build-Depend on kaffe
+ * Depends on kaffe | java1-runtime | java2-runtime
+ * Remove Takashi, Ola, Stephan from uploaders to reflect current uploaders
+ * Added myself to uploaders
+
+ -- Wolfgang Baer <WBaer@gmx.de> Sun, 15 Jan 2006 22:12:13 +0100
+
+javax-servletapi2.3 (4.0-7) unstable; urgency=low
+
+ * debian/control, debian/rules: ant transition
+
+ -- Arnaud Vandyck <avdyk@debian.org> Thu, 22 Sep 2005 23:41:05 +0200
+
+javax-servletapi2.3 (4.0-6) unstable; urgency=low
+
+ * gjdoc is now able to build the javadoc (closes: #279374)
+
+ -- Arnaud Vandyck <avdyk@debian.org> Fri, 25 Feb 2005 18:32:35 +0100
+
+javax-servletapi2.3 (4.0-5) unstable; urgency=low
+
+ * added target=1.3 to the javac task. It should be enough to closes:
+ #262897
+ * changed maintainer to 'Debian Java Maintainers'
+
+ -- Arnaud Vandyck <avdyk@debian.org> Fri, 6 Aug 2004 01:27:04 +0200
+
+javax-servletapi2.3 (4.0-4) unstable; urgency=low
+
+ * Move to main! Built with free compilers and javadoc generated by
+ gjdoc. Thanks to Josh Triplett (closes: #246632)
+ * Added me as an uploader
+ * Created a patch for javadoc ant task
+
+ -- Arnaud Vandyck <avdyk@debian.org> Tue, 6 Jul 2004 12:55:39 +0200
+
+javax-servletapi2.3 (4.0-3) unstable; urgency=low
+
+ * Build with debhelper >= 4.1.0 to get rid of /usr/doc compatibility
+ symlinks
+ * Standards-Version: 3.5.7 (no changes required)
+ * Added Takashi Okamoto and Ola Lundqvist as uploaders
+
+ -- Stefan Gybas <sgybas@debian.org> Wed, 23 Oct 2002 14:08:20 +0200
+
+javax-servletapi2.3 (4.0-2) unstable; urgency=low
+
+ * Fixed spelling error in description and README.Debian (closes: #125043)
+ * Changed Build-Depends to Build-Depends-Indep (found by Lintian)
+ * Corrected URLs to servlet specification
+
+ -- Stefan Gybas <sgybas@debian.org> Sun, 10 Feb 2002 15:45:34 +0100
+
+javax-servletapi2.3 (4.0-1) unstable; urgency=low
+
+ * New upstream release: Servlet 2.3 and JSP 1.2 spec from Tomcat 4.0
+ * Renamed the package to libservlet2.3-java so it can be installed
+ together with libservlet2.2-java
+ * Ant has moved to contrib and it is required to build this package so
+ it has to move to contrib, too.
+ * Build using j2sdk1.3 instead of jikes and doc++ so be get better
+ looking Javadoc documentation
+ * Standards-Version: 3.5.6 (no changed required)
+ * Use debhelper V3
+ * Updated README.Debian and copyright with new versions and URLs
+
+ -- Stefan Gybas <sgybas@debian.org> Tue, 18 Sep 2001 13:33:46 +0200
+
+javax-servletapi2.2 (2.2-2) unstable; urgency=low
+
+ * Included an upstream patch from the official Tomcat 3.2 release:
+ - Added status code SC_TEMPORARY_REDIRECT (307) to HttpServletResponse
+ - Javadoc fix for HttpSession.java
+
+ -- Stefan Gybas <sgybas@gybas.com> Wed, 13 Dec 2000 00:38:03 +0100
+
+javax-servletapi2.2 (2.2-1) unstable; urgency=low
+
+ * Initial Release
+
+ -- Stefan Gybas <sgybas@debian.org> Tue, 12 Sep 2000 22:55:37 +0200
--- javax-servletapi2.3-4.0.orig/debian/README.Debian
+++ javax-servletapi2.3-4.0/debian/README.Debian
@@ -0,0 +1,13 @@
+Java Servlet 2.3 API for Debian
+===============================
+
+- The Servlet 2.3 and JSP 1.2 classes were originally written by Sun and are
+ part of the Java 2 Platform Enterprise Edition. They have been donated
+ to the Apache-Jakarta project for inclusion in the Tomcat reference
+ implementation.
+
+- For more information about Java servlets please take a look at the Tomcat
+ home page at http://jakarta.apache.org/tomcat/index.html
+
+- The official Servlet 2.3 and JSP 1.2 specifications can be found at
+ http://java.sun.com/products/servlet/ and http://java.sun.com/products/jsp/
--- javax-servletapi2.3-4.0.orig/debian/copyright
+++ javax-servletapi2.3-4.0/debian/copyright
@@ -0,0 +1,64 @@
+This package was debianized by Stefan Gybas <sgybas@debian.org> on
+12-Sep-2000. The source was downloaded from
+http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.0/src/.
+
+Upstream authors: Sun Microsystems, Inc.
+ The Apache Jakarta project
+
+The following copyright applies to this package (BSD-style license):
+
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
--- javax-servletapi2.3-4.0.orig/debian/patches/01_gjdoc_compatibility.patch
+++ javax-servletapi2.3-4.0/debian/patches/01_gjdoc_compatibility.patch
@@ -0,0 +1,40 @@
+--- build.xml.orig 2004-08-06 01:21:53.269975936 +0200
++++ build.xml 2004-08-06 01:22:10.343380384 +0200
+@@ -59,7 +59,7 @@
+ <!-- Java classes -->
+ <javac srcdir="src/share" destdir="${servletapi.build}/classes"
+ debug="${compile.debug}" deprecation="${compile.deprecation}"
+- optimize="${compile.optimize}"/>
++ optimize="${compile.optimize}" target="1.3"/>
+
+ <!-- Associated property files -->
+ <copy todir="${servletapi.build}/classes">
+@@ -89,13 +89,21 @@
+ <!-- ======================== Build JavaDoc =========================== -->
+ <target name="javadoc" depends="prepare">
+
+- <javadoc packagenames="javax.servlet.*"
+- sourcepath="${basedir}/src/share"
+- destdir="${servletapi.build}/docs/api"
+- use="true"
+- windowtitle="Servlet and JavaServer Pages API Documentation"
+- doctitle="Servlet and JavaServer Pages API Documentation"
+- bottom="Copyright &copy; 1999-2001 The Apache Software Foundation. All Rights Reserved."/>
++ <!-- This is temporary, until Kaffe's javadoc script runs gjdoc. The
++ gjdoc ant task does not work, because it invokes the gjdoc class
++ directly instead of through /usr/bin/gjdoc. -->
++ <exec executable="gjdoc">
++ <arg value="-d" />
++ <arg value="${servletapi.build}/docs/api" />
++ <arg value="-title" />
++ <arg value="Servlet and JavaServer Pages API Documentation" />
++ <arg value="-sourcepath" />
++ <arg value="${basedir}/src/share" />
++ <arg value="javax.servlet" />
++ <arg value="javax.servlet.http" />
++ <arg value="javax.servlet.jsp" />
++ <arg value="javax.servlet.jsp.tagext" />
++ </exec>
+
+ </target>
+