[pkg-java] r12554 - in tags/jetty: . 6.1.24-3/debian

Torsten Werner twerner at alioth.debian.org
Fri Jun 11 15:42:16 UTC 2010


Author: twerner
Date: 2010-06-11 15:42:15 +0000 (Fri, 11 Jun 2010)
New Revision: 12554

Added:
   tags/jetty/6.1.24-3/
   tags/jetty/6.1.24-3/debian/README.Debian-source
   tags/jetty/6.1.24-3/debian/TODO
   tags/jetty/6.1.24-3/debian/build.xml
   tags/jetty/6.1.24-3/debian/changelog
   tags/jetty/6.1.24-3/debian/control
   tags/jetty/6.1.24-3/debian/jetty-extra.conf
   tags/jetty/6.1.24-3/debian/libjetty-extra-java.dirs
   tags/jetty/6.1.24-3/debian/libjetty-extra-java.links
   tags/jetty/6.1.24-3/debian/libjetty-extra-java.poms
   tags/jetty/6.1.24-3/debian/rules
Removed:
   tags/jetty/6.1.24-3/debian/README.Debian-source
   tags/jetty/6.1.24-3/debian/TODO
   tags/jetty/6.1.24-3/debian/build.xml
   tags/jetty/6.1.24-3/debian/changelog
   tags/jetty/6.1.24-3/debian/control
   tags/jetty/6.1.24-3/debian/jetty-extra.conf
   tags/jetty/6.1.24-3/debian/libjetty-extra-java.dirs
   tags/jetty/6.1.24-3/debian/libjetty-extra-java.links
   tags/jetty/6.1.24-3/debian/libjetty-extra-java.poms
   tags/jetty/6.1.24-3/debian/rules
Log:
[svn-buildpackage] Tagging jetty 6.1.24-3

Deleted: tags/jetty/6.1.24-3/debian/README.Debian-source
===================================================================
--- trunk/jetty/debian/README.Debian-source	2010-06-11 14:21:39 UTC (rev 12552)
+++ tags/jetty/6.1.24-3/debian/README.Debian-source	2010-06-11 15:42:15 UTC (rev 12554)
@@ -1,58 +0,0 @@
-jetty for Debian
-----------------
-
-BUILD DEPENDENCIES:
- cdbs
- debhelper
- devscripts
- fakeroot
- 
- JAVA DEBS:
- ant
- libservlet2.5-java
- libmx4j-java
- libgnumail-java
- libgnujaf-java
-
--------------------------------------------------------------------
-
-TESTING ANT BUILD (no dependencies required):
-$ ant -DVERSION=6.1.18 testbuild
-
-CLEAN:
-$ ant -DVERSION=6.1.18 clean
-
-GENERATING SOURCE:
-$ ant -DVERSION=6.1.18 generate-deb-source
-
-GENERATING BINARIES/DEBS:
-$ ant -DVERSION=6.1.18 generate-deb-binaries
-
-MANUAL INSTALLATION:
-$ sudo dpkg -i libjetty-java_6.1.18-1_all.deb
-$ sudo dpkg -i libjetty-extra-java_6.1.18-1_all.deb
-$ sudo dpkg -i jetty_6.1.18-1_all.deb
-
--------------------------------------------------------------------
-
-GENERATED DEB SOURCES:
- jetty-6.1.18.orig.tar.gz
- jetty_6.1.18-1.dsc
- jetty_6.1.18-1.diff.gz
-
-
-GENERATED DEB BINARIES:
- libjetty-java
-  - Jetty 6 core modules
-  - includes:
-     jetty-util, jetty-util5, jetty, jetty-sslengine, jetty-start
- 
- libjetty-extra-java
-  - Jetty 6 extra modules (depends: libjetty-java)
-  - includes:
-     jetty-management, jetty-naming, jetty-servlet-tester, jetty-ajp, jetty-java5-threadpool, jetty-client, jetty-rewrite-handler
- 
- jetty
-  - The standalone http server (depends: libjetty-java)
-  - includes:
-     scripts, config files, docs

Copied: tags/jetty/6.1.24-3/debian/README.Debian-source (from rev 12553, trunk/jetty/debian/README.Debian-source)
===================================================================
--- tags/jetty/6.1.24-3/debian/README.Debian-source	                        (rev 0)
+++ tags/jetty/6.1.24-3/debian/README.Debian-source	2010-06-11 15:42:15 UTC (rev 12554)
@@ -0,0 +1,60 @@
+jetty for Debian
+----------------
+
+BUILD DEPENDENCIES:
+ cdbs
+ debhelper
+ devscripts
+ fakeroot
+ 
+ JAVA DEBS:
+ ant
+ libservlet2.5-java
+ libmx4j-java
+ libgnumail-java
+ libgnujaf-java
+ libtomcat6-java
+ geronimo-jta-1.0.1b-spec
+
+-------------------------------------------------------------------
+
+TESTING ANT BUILD (no dependencies required):
+$ ant -DVERSION=6.1.18 testbuild
+
+CLEAN:
+$ ant -DVERSION=6.1.18 clean
+
+GENERATING SOURCE:
+$ ant -DVERSION=6.1.18 generate-deb-source
+
+GENERATING BINARIES/DEBS:
+$ ant -DVERSION=6.1.18 generate-deb-binaries
+
+MANUAL INSTALLATION:
+$ sudo dpkg -i libjetty-java_6.1.18-1_all.deb
+$ sudo dpkg -i libjetty-extra-java_6.1.18-1_all.deb
+$ sudo dpkg -i jetty_6.1.18-1_all.deb
+
+-------------------------------------------------------------------
+
+GENERATED DEB SOURCES:
+ jetty-6.1.18.orig.tar.gz
+ jetty_6.1.18-1.dsc
+ jetty_6.1.18-1.diff.gz
+
+
+GENERATED DEB BINARIES:
+ libjetty-java
+  - Jetty 6 core modules
+  - includes:
+     jetty-util, jetty-util5, jetty, jetty-sslengine, jetty-start
+ 
+ libjetty-extra-java
+  - Jetty 6 extra modules (depends: libjetty-java)
+  - includes:
+     jetty-management, jetty-naming, jetty-servlet-tester, jetty-ajp, jetty-java5-threadpool, jetty-client, jetty-rewrite-handler, jetty-plus, jetty-annotations
+ 
+ jetty
+  - The standalone http server (depends: libjetty-java)
+  - includes:
+     scripts, config files, docs

Deleted: tags/jetty/6.1.24-3/debian/TODO
===================================================================
--- trunk/jetty/debian/TODO	2010-06-11 14:21:39 UTC (rev 12552)
+++ tags/jetty/6.1.24-3/debian/TODO	2010-06-11 15:42:15 UTC (rev 12554)
@@ -1,18 +0,0 @@
-TODO List for jetty in debian
-
-* evaluate authbind
-
-Modules to add:
-
-jetty-plus
- - geronimo-jta must be available as a deb package (build & runtime dependency)
-
-jetty-annotations
- - genonimo-annotation must be available as a deb package (build & runtime dependency)
-
-jetty-terracota
-
-jetty-xbean
- - spring-framework must be available as a deb package (build dependency)
- - xbean must include the module xbean-spring
-

Copied: tags/jetty/6.1.24-3/debian/TODO (from rev 12553, trunk/jetty/debian/TODO)
===================================================================
--- tags/jetty/6.1.24-3/debian/TODO	                        (rev 0)
+++ tags/jetty/6.1.24-3/debian/TODO	2010-06-11 15:42:15 UTC (rev 12554)
@@ -0,0 +1,12 @@
+TODO List for jetty in debian
+
+* evaluate authbind
+
+Modules to add:
+
+jetty-terracota
+
+jetty-xbean
+ - spring-framework must be available as a deb package (build dependency)
+ - xbean must include the module xbean-spring
+

Deleted: tags/jetty/6.1.24-3/debian/build.xml
===================================================================
--- trunk/jetty/debian/build.xml	2010-06-11 14:21:39 UTC (rev 12552)
+++ tags/jetty/6.1.24-3/debian/build.xml	2010-06-11 15:42:15 UTC (rev 12554)
@@ -1,148 +0,0 @@
-<project name="jetty build" basedir=".." default="package">
-  <property name="src.dir" value="src/main/java"/>
-  <property name="test.dir" value="src/test/java"/>
-  <property name="rsrc.dir" value="src/main/resources"/>
-  <property name="config.dir" value="src/main/config/etc"/>
-  <property name="build.dir" value="${basedir}/build"/>
-  <property name="target.dir" value="${basedir}/target"/>
-  <property name="lib.dir" value="${basedir}/lib"/>
-  <property name="etc.dir" value="${basedir}/etc"/>
-  <property name="javadoc.dir" value="${basedir}/api"/>
-  <property name="module.script" location="debian/module.xml"/>
-
-  <path id="classpath">
-    <fileset dir="${target.dir}">
-      <include name="**/*.jar"/>
-    </fileset>
-  </path>
-
-  <target name="package">
-    <mkdir dir="${build.dir}"/>
-    <mkdir dir="${target.dir}"/>
-    <mkdir dir="${lib.dir}"/>
-    <mkdir dir="${etc.dir}"/>
-    
-    <ant dir="${basedir}/modules/util/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-util"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}"/>
-      <property name="run-tests" value="true"/>
-    </ant>
-    
-    <ant dir="${basedir}/modules/util5/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-util5"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}/util5"/>
-      <property name="run-tests" value="true"/>
-    </ant>
-    
-    <ant dir="${basedir}/modules/jetty/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}"/>
-      <property name="run-tests" value="true"/>
-    </ant>
-    
-    <ant dir="${basedir}/extras/sslengine/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-sslengine"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}/sslengine"/>
-    </ant>
-    
-    <ant dir="${basedir}/modules/start/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-start"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${basedir}"/>
-      <property name="jar.main.class" value="org.mortbay.start.Main"/>
-      <property name="jar.file" value="start.jar"/>
-    </ant>
-    
-    <ant dir="${basedir}/contrib/start-daemon/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-start-daemon"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${basedir}"/>
-      <property name="jar.main.class" value="org.mortbay.jetty.start.daemon.Bootstrap"/>
-      <property name="jar.file" value="start-daemon.jar"/>
-    </ant>
-    
-    <!-- EXTRAS -->
-    
-    <ant dir="${basedir}/modules/html/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-html"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}/ext"/>
-    </ant>
-    
-    <ant dir="${basedir}/modules/management/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-management"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}/management"/>
-    </ant>
-    
-    <ant dir="${basedir}/modules/naming/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-naming"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}/naming"/>
-    </ant>
-    
-    <ant dir="${basedir}/extras/servlet-tester/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-servlet-tester"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}/ext"/>
-    </ant>
-    
-    <ant dir="${basedir}/extras/ajp/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-ajp"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}/ext"/>
-    </ant>
-    
-    <ant dir="${basedir}/extras/setuid/modules/java/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-setuid"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}/ext"/>
-    </ant>
-    
-    <ant dir="${basedir}/extras/threadpool/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-java5-threadpool"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}/ext"/>
-    </ant>
-    
-    <ant dir="${basedir}/extras/client/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-client"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}/ext"/>
-    </ant>
-    
-    <ant dir="${basedir}/contrib/jetty-rewrite-handler/" antfile="${module.script}" inheritRefs="true">
-      <property name="module-name" value="jetty-rewrite-handler"/>
-      <property name="module-version" value="${VERSION}"/>
-      <property name="module-libdir" value="${lib.dir}/ext"/>
-    </ant>
-    
-    <copy file="${basedir}/modules/jetty/src/main/resources/org/mortbay/jetty/webapp/webdefault.xml" todir="${etc.dir}"/>
-    <copy file="${basedir}/debian/start.config" todir="${etc.dir}"/>
-    <copy file="${basedir}/debian/jetty.conf" todir="${etc.dir}"/>
-    <copy file="${basedir}/debian/jetty-extra.conf" todir="${etc.dir}"/>
-  </target>
-  
-  <target name="clean">
-    <delete dir="${build.dir}" quiet="true"/>
-    <delete>
-      <fileset dir="${basedir}/modules" includes="**/test/java/**/*.class"/>
-    </delete>
-    <delete dir="${target.dir}" quiet="true"/>
-    <delete dir="${lib.dir}" quiet="true"/>
-    <delete dir="${etc.dir}" quiet="true"/>
-    <delete includeemptydirs="true" quiet="true">
-      <fileset dir="${javadoc.dir}" excludes="contents.html"/>
-    </delete>
-    <delete file="${basedir}/start.jar" quiet="true"/>
-    <delete file="${basedir}/start-daemon.jar" quiet="true"/>
-    <delete file="${basedir}/extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.c" quiet="true"/>
-    <delete file="${basedir}/extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.h" quiet="true"/>
-  </target>
-  
-</project>
-

Copied: tags/jetty/6.1.24-3/debian/build.xml (from rev 12553, trunk/jetty/debian/build.xml)
===================================================================
--- tags/jetty/6.1.24-3/debian/build.xml	                        (rev 0)
+++ tags/jetty/6.1.24-3/debian/build.xml	2010-06-11 15:42:15 UTC (rev 12554)
@@ -0,0 +1,160 @@
+<project name="jetty build" basedir=".." default="package">
+  <property name="src.dir" value="src/main/java"/>
+  <property name="test.dir" value="src/test/java"/>
+  <property name="rsrc.dir" value="src/main/resources"/>
+  <property name="config.dir" value="src/main/config/etc"/>
+  <property name="build.dir" value="${basedir}/build"/>
+  <property name="target.dir" value="${basedir}/target"/>
+  <property name="lib.dir" value="${basedir}/lib"/>
+  <property name="etc.dir" value="${basedir}/etc"/>
+  <property name="javadoc.dir" value="${basedir}/api"/>
+  <property name="module.script" location="debian/module.xml"/>
+
+  <path id="classpath">
+    <fileset dir="${target.dir}">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+
+  <target name="package">
+    <mkdir dir="${build.dir}"/>
+    <mkdir dir="${target.dir}"/>
+    <mkdir dir="${lib.dir}"/>
+    <mkdir dir="${etc.dir}"/>
+    
+    <ant dir="${basedir}/modules/util/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-util"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}"/>
+      <property name="run-tests" value="true"/>
+    </ant>
+    
+    <ant dir="${basedir}/modules/util5/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-util5"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/util5"/>
+      <property name="run-tests" value="true"/>
+    </ant>
+    
+    <ant dir="${basedir}/modules/jetty/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}"/>
+      <property name="run-tests" value="true"/>
+    </ant>
+    
+    <ant dir="${basedir}/extras/sslengine/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-sslengine"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/sslengine"/>
+    </ant>
+    
+    <ant dir="${basedir}/modules/start/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-start"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${basedir}"/>
+      <property name="jar.main.class" value="org.mortbay.start.Main"/>
+      <property name="jar.file" value="start.jar"/>
+    </ant>
+    
+    <ant dir="${basedir}/contrib/start-daemon/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-start-daemon"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${basedir}"/>
+      <property name="jar.main.class" value="org.mortbay.jetty.start.daemon.Bootstrap"/>
+      <property name="jar.file" value="start-daemon.jar"/>
+    </ant>
+    
+    <!-- EXTRAS -->
+    
+    <ant dir="${basedir}/modules/html/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-html"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <ant dir="${basedir}/modules/management/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-management"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/management"/>
+    </ant>
+    
+    <ant dir="${basedir}/modules/naming/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-naming"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/naming"/>
+    </ant>
+    
+    <ant dir="${basedir}/extras/servlet-tester/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-servlet-tester"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <ant dir="${basedir}/extras/ajp/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-ajp"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <ant dir="${basedir}/extras/setuid/modules/java/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-setuid"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <ant dir="${basedir}/extras/threadpool/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-java5-threadpool"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <ant dir="${basedir}/extras/client/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-client"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+    
+    <ant dir="${basedir}/contrib/jetty-rewrite-handler/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-rewrite-handler"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+
+     <ant dir="${basedir}/modules/plus/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-plus"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/plus"/>
+    </ant>
+
+     <ant dir="${basedir}/modules/annotations/" antfile="${module.script}" inheritRefs="true">
+      <property name="module-name" value="jetty-annotations"/>
+      <property name="module-version" value="${VERSION}"/>
+      <property name="module-libdir" value="${lib.dir}/ext"/>
+    </ant>
+  
+    <copy file="${basedir}/modules/jetty/src/main/resources/org/mortbay/jetty/webapp/webdefault.xml" todir="${etc.dir}"/>
+    <copy file="${basedir}/debian/start.config" todir="${etc.dir}"/>
+    <copy file="${basedir}/debian/jetty.conf" todir="${etc.dir}"/>
+    <copy file="${basedir}/debian/jetty-extra.conf" todir="${etc.dir}"/>
+  </target>
+  
+  <target name="clean">
+    <delete dir="${build.dir}" quiet="true"/>
+    <delete>
+      <fileset dir="${basedir}/modules" includes="**/test/java/**/*.class"/>
+    </delete>
+    <delete dir="${target.dir}" quiet="true"/>
+    <delete dir="${lib.dir}" quiet="true"/>
+    <delete dir="${etc.dir}" quiet="true"/>
+    <delete includeemptydirs="true" quiet="true">
+      <fileset dir="${javadoc.dir}" excludes="contents.html"/>
+    </delete>
+    <delete file="${basedir}/start.jar" quiet="true"/>
+    <delete file="${basedir}/start-daemon.jar" quiet="true"/>
+    <delete file="${basedir}/extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.c" quiet="true"/>
+    <delete file="${basedir}/extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.h" quiet="true"/>
+  </target>
+  
+</project>
+

Deleted: tags/jetty/6.1.24-3/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog	2010-06-11 14:21:39 UTC (rev 12552)
+++ tags/jetty/6.1.24-3/debian/changelog	2010-06-11 15:42:15 UTC (rev 12554)
@@ -1,490 +0,0 @@
-jetty (6.1.24-3) unstable; urgency=low
-
-  * UNRELEASED
-  * Merge changes from Ubuntu version 6.1.22-1ubuntu1:
-    - debian/build.xml, debian/module.xml: Enable tests in the jetty module
-    - debian/rules: Adding slf4j-simple to the DEB_JARS since it's used in
-      tests
-    - debian/rules, debian/control: Added junit and ant-optional needed for
-      tests
-
- -- Torsten Werner <twerner at debian.org>  Tue, 04 May 2010 21:28:35 +0200
-
-jetty (6.1.24-2) unstable; urgency=low
-
-  * Set JAVA_HOME in d/rules to /usr/lib/jvm/default-java. (Closes: #578618,
-    #579469)
-  * Fix the installation of jetty-util5.jar. (Closes: #569328)
-
- -- Torsten Werner <twerner at debian.org>  Thu, 29 Apr 2010 07:36:43 +0200
-
-jetty (6.1.24-1) unstable; urgency=low
-
-  [ Niels Thykier ]
-  * Reduced Depends on libjetty-java-doc to a Suggests. (Closes: #569293)
-  * Clarified what JETTY_HOST should be set to in order to accept all
-    connections. (Closes: #554874)
-  * Bumped Standards-Version to 3.8.4 - no changes required.
-
-  [ Torsten Werner ]
-  * New upstream release.
-  * Change Build-Depends: default-jdk. (Closes: #578618)
-  * Switch to source format 3.0.
-
- -- Torsten Werner <twerner at debian.org>  Fri, 23 Apr 2010 23:55:35 +0200
-
-jetty (6.1.22-1ubuntu1) lucid; urgency=low
-
-  * debian/build.xml, debian/module.xml: Enable tests in the jetty module
-  * debian/rules: Adding slf4j-simple to the DEB_JARS since it's used in tests
-  * debian/rules, debian/control: Added junit and ant-optional needed for tests
-  * debian/control, debian/rules: Build with default-jdk.
-
- -- Thierry Carrez <thierry.carrez at ubuntu.com>  Tue, 26 Jan 2010 09:52:06 +0100
-
-jetty (6.1.22-1) unstable; urgency=medium
-
-  * New upstream release. (Closes: #553644)
-  * Added OSGi bundle metadata (by upstream). (Closes: #558187)
-  * Corrected path to jetty web-apps (by Niels Thykier). (Closes: #554877)
-
- -- Pablo Duboue <pablo.duboue at gmail.com>  Sun, 13 Dec 2009 1:55:00 -0400
-  
-jetty (6.1.21-1) unstable; urgency=medium
-
-  * New upstream release.
-  * Stopped using /tmp/jetty-temp in /etc/init.d/jetty for security
-    reasons.
-    - JVM_TMP is now /var/cache/jetty/tmp
-    - JETTY_TMP is now /var/cache/jetty/data
-  * The postrm script no longer deletes files in /tmp/jetty-temp.
-  * Removed Philipp Meier from Uploaders (last upload was 2006-06-07).
-    Thanks for your work on this package.
-  * Corrected javadoc symlink in binary package jetty.
-
- -- Niels Thykier <niels at thykier.net>  Fri, 23 Oct 2009 20:45:43 +0200
-
-jetty (6.1.20-2) unstable; urgency=low
-
-  * Move documentation to /usr/share/doc/libjetty-java
-  * Better postinst and postrm scripts, aligned with tomcat6 scripts:
-     - postinst: user jetty is created with its own group
-     - postrm: better cleanup of temporary data,
-       thourough remove and purge of data
-  * debian/changelog:
-    - fix suggest for package libjetty-java-doc, add libjetty-java-doc
-      to the list of Suggests for libjetty-java
-    - add libjetty-extra to the list of Suggests for package jetty.
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 07 Sep 2009 00:22:20 +0100
-
-jetty (6.1.20-1) unstable; urgency=medium
-
-  [ Niels Thykier ]
-  * New upstream release.
-  * Stop using Build-Depends-Indep, since the policy and the build
-    daemons disagree on when it should be used (Closes: #540861).
-  * Corrected jetty.install to reflect the move of some license files
-    in the source tree.
-  * Bumped to Standard-Versions 3.8.3 - no changes required.
-  * Updated jetty.post{install,rm} scripts to use "set -e" instead of
-    passing it to sh.
-  * Installed "VERSION.txt" as upstream changelog.
-  * A previous version (6.1.18-1) fixed the following security problems, which
-    were not mentioned in the changelog: CVE-2007-5613, CVE-2007-5614,
-    CVE-2007-5615, CVE-2009-1523, and CVE-2009-1524 (see below for more
-    information).
-
-  [ Torsten Werner ]
-  * Set urgency to medium because this version fixes a FTBFS.
-
- -- Torsten Werner <twerner at debian.org>  Sun, 06 Sep 2009 23:06:45 +0200
-
-jetty (6.1.19-2) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Torsten Werner <twerner at debian.org>  Sun, 09 Aug 2009 08:48:10 +0200
-
-jetty (6.1.19-1) experimental; urgency=low
-
-  [ Ludovic Claude ]
-  * New upstream release fixing a security vulnerability
-    (cookies are not secure if you are running behind a netscaler).
-  * Remove the bootstrap patch as it has been added upstream and update
-    the build to use the new start-daemon component.
-  * Remove the Build-Depend on quilt as the patch is not needed anymore.
-  * Add the Maven POM to the package.
-  * Add a Build-Depends dependency on maven-repo-helper.
-  * Use mh_installpom and mh_installjar to install the POM and the jar to the
-    Maven repository.
-  * Add optional support for web applications located in /usr/share/webapps.
-  * Add a cron job that cleans up the old log files in /var/log/jetty.
-  * Register the Javadoc into Debian documentation and put it in a
-    separate package (libjetty-java-doc).
-  * Use openjdk-6-jdk for the build; add a Build-Depends on this
-    package. Required to build the javadoc.
-  * Update debian/copyright (patch provided by Jan Pascal Vanbest
-    <janpascal at vanbest.org>).
-
-  [ Torsten Werner ]
-  * Add myself to Uploaders.
-  * Update Standards-Version: 3.8.2.
-  * Move package libjetty-java-doc to Section: doc.
-  * Fix init script: check for /etc/default/rcS before reading it.
-
- -- Torsten Werner <twerner at debian.org>  Tue, 14 Jul 2009 11:50:43 +0200
-
-jetty (6.1.18-1) unstable; urgency=low
-
-  [Ludovic Claude]
-  * Add myself to Uploaders.
-  * Change the build dependency on java-gcj to default-jdk.
-  * Add init.d startup script.
-  * Add dependencies on ant, libslf4j-java, libxerces2-java, libtomcat6-java
-    for libjetty-extra-java, add links for the lib folder.
-  * Add dependency on jsvc to run jetty as a daemon.
-  * Add the package libjetty-setuid-java for the Setuid module (with native
-    code).
-  * Add an index page used when Jetty starts.
-  * Use latest jasper from Tomcat to provide jsp 2.1 instead of
-    Glassfish JSP implementation as in the standard distribution.
-  * Add tools.jar to the classpath to be able to run JSP (Closes: #452586).
-  * Fix Lintian warnings: add ${misc:Depends} to all Depends.
-  * Move jetty to main as all its dependencies are in main,
-    and jetty contains only code that complies with Debian guidelines,
-    use java section like tomcat6
-    (Closes: #498582).
-  * Do not depend on tomcat 5.5 (Closes: #530720, #458399).
-  * Remove empty prerm and preinst scripts.
-  * Remove old patches that don't apply anymore.
-  * Update copyright and remove full text of Apache license.
-  * Bump up compat to 6 and Standards-Version to 3.8.1.
-
-  [David Yu]
-  * New upstream release for jetty
-    (Closes: #528389, #527571, #454529, #425152).
-  * Fixed jetty.links. Now delegates install of start.jar to libjetty-java.
-
-  [ Torsten Werner ]
-  * fixes several security issues:
-    - CVE-2007-5613: Cross-site scripting (XSS) vulnerability in Dump Servlet.
-    - CVE-2007-5614: Quote Sequence vulnerability.
-    - CVE-2007-5615: CRLF injection vulnerability.
-    - CVE-2009-1523: Directory traversal vulnerability in the HTTP server in
-    Mort Bay Jetty.
-    - CVE-2009-1524: Cross-site scripting (XSS) vulnerability in Mort
-    Bay Jetty.
-    (Closes: #454529, #528389, #527571, #543462).
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 12 Jun 2009 17:19:08 +0100
-
-jetty (5.1.14-1) unstable; urgency=low
-
-  * New upstream release.
-    - Removed debian/patches/cve-2007-6969.patch. Applied upstream.
-  * Added recognition of installed libcommons-el-java to debian/start.config.
-    Closes: #352093.
-  * Fixed short and long service description in debian/jetty.init.
-    Closes: #446788.
-  * Removed libapache2-mod-webapp from Suggests.
-  * Added watch file.
-
- -- Michael Koch <konqueror at gmx.de>  Wed, 24 Oct 2007 14:14:45 +0200
-
-jetty (5.1.10-4) unstable; urgency=low
-
-  * Added patch to fix CVE-2006-6969. Thanks to Greg Wilkins for the patch.
-    Closes: #445283.
-  * Updated debian/patches/jdk-1.2-src-encoding.patch to make it work with
-    current ecj.
-
- -- Michael Koch <konqueror at gmx.de>  Fri, 05 Oct 2007 07:34:55 +0200
-
-jetty (5.1.10-3) unstable; urgency=low
-
-  * Fix debian/jetty.init to permit removal without purge and offer a new
-    NO_START option in /etc/default/jetty. Closes: #356067.
-    Thanks to Loic Minier for the patch.
-  * Added additional paths to JDK_DIRS in debian/jetty.init.
-    Closes: #405851.
-  * (Build-)Depends on java-gcj-compat.
-  * Moved debhelper from Build-Depends-Indep to Build-Depends.
-  * Removed Build-Depends on libtomcat5-java and replace Depends on
-    libtomcat5-java by libtomcat5.5-java.
-  * Added LSB section in debian/jetty.init.
-  * Removed extra license file from /usr/share/doc/jetty.
-  * Added myself to Uploaders.
-
- -- Michael Koch <konqueror at gmx.de>  Tue, 24 Jul 2007 20:40:27 +0200
-
-jetty (5.1.10-2) unstable; urgency=low
-
-  * Fix in init script for new version of su (closes #367491).
-  * Create logfile if not existing. Aknolwedge NMU (closes #356066).
-
- -- Philipp Meier <meier at fnogol.de>  Tue, 30 May 2006 10:46:21 +0200
-
-jetty (5.1.10-1) unstable; urgency=low
-
-  * New upstream release.
-  * Sercurity fixes for windows.
-  * Fixed path aliasing with // on windows.
-  * Fix for AJP13 with multiple headers.
-  * Fix for AJP13 with encoded path.
-  * Remove null dispatch attributes from getAttributeNames.
-  * Put POST content default back to iso_8859_1. GET is UTF-8
-    still.
-
- -- Philipp Meier <meier at fnogol.de>  Tue, 30 May 2006 10:40:18 +0200
-
-jetty (5.1.8-3) unstable; urgency=low
-
-  * Enhance dependencies.
-
- -- Philipp Meier <meier at fnogol.de>  Fri, 16 Dec 2005 10:53:48 +0100
-
-jetty (5.1.8-2) unstable; urgency=low
-
-  * Add dependeny on apache2-util for log rotation. Closes: #343177.
-
- -- Philipp Meier <meier at fnogol.de>  Tue, 13 Dec 2005 14:28:09 +0100
-
-jetty (5.1.8-1) unstable; urgency=low
-
-  * New upstream release.
-
-  From 5.1.8:
-
-  * Fixed space in URL issued created in 5.1.6.
-
-  From 5.1.7:
-
-  * improved server stats.
-  * char encoding for MultiPartRequest.
-  * fixed merging of POST params in dispatch query string.
-  * protect from NPE in dispatcher getValues.
-  * Updated to 2.6.2 xerces.
-  * JSP file servlet mappings copy JspServlet init params.
-  * Prefix servlet context logs with org.mortbay.jetty.context.
-  * better support for URI character encodings.
-  * use commons logging jar instead of api jar.
-
- -- Philipp Meier <meier at fnogol.de>  Wed,  7 Dec 2005 11:06:10 +0100
-
-jetty (5.1.6-1) unstable; urgency=high
-
-  * New upstream release.
-  * Fixed JSP visibility security issue in upstream.
-  * Fix location of jasper since upgrade to tomcat5. Closes: #333010.
-
- -- Philipp Meier <meier at fnogol.de>  Wed, 30 Nov 2005 15:20:47 +0100
-
-jetty (5.1.5rc1-5) unstable; urgency=low
-
-  Patch from Oyvind Harboe <oyvind.harboe at zylin.com>:
-
-  * increased default amount of memory available to 256Mbyte.
-    the advantage of having more heap available is that more
-    applications will be able to run without modification to
-    the standard Jetty configuration.
-  * added -Djava.library.path=/usr/lib to VM arguments. This is
-    requried to make e.g. the librxtx-java package work.
-  * Closes: #32960.
-
- -- Philipp Meier <meier at fnogol.de>  Thu, 22 Sep 2005 16:13:16 +0200
-
-jetty (5.1.5rc1-4) unstable; urgency=low
-
-  Patch from Oyvind Harboe <oyvind.harboe at zylin.com>:
-
-  * Fixed rc script /etc/init.d/jetty. "stop" could leave dangling
-    /var/run/jetty.pid. Fixed this by adding "--oknodo" to
-    "start-stop-daemon --stop" command.
-  * Removed trailing "/" from LOGDIR which caused
-    /var/log/out.log not to be created.
-  * /etc/init.d/jetty start will now deal more gracefully with a
-    dangling /var/run/jetty.pid. A dangling jetty.pid is detected
-    and ignored.
-  * Closes: #326176.
-
- -- Philipp Meier <meier at fnogol.de>  Fri,  2 Sep 2005 13:40:59 +0200
-
-jetty (5.1.5rc1-3) unstable; urgency=low
-
-  * Removed -v from ant opts during build.
-  * Remove pid file on stop. Closes: #325667
-  * Fix location of ant-1.6.jar in start.config. Closes: #324472.
-
- -- Philipp Meier <meier at fnogol.de>  Tue, 30 Aug 2005 13:37:15 +0200
-
-jetty (5.1.5rc1-2) unstable; urgency=low
-
-  * Builds with kaffe.
-  * Adds patch to exclude Sun JSSE if not available.
-
- -- Philipp Meier <meier at fnogol.de>  Sat, 27 Aug 2005 14:21:12 +0200
-
-jetty (5.1.5rc1-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Philipp Meier <meier at fnogol.de>  Fri, 26 Aug 2005 12:53:50 +0200
-
-jetty (5.1.4-1) unstable; urgency=low
-
-  * New upstream release.
-  * Added myself to Uploaders in control.
-  * Standards-Version bumbed to 3.6.2.
-  * Removed debian/watch which will not work with sourceforge.
-  * Manage changes to upstream with cdbs simple-patchsys.
-  * Fixed rc script /etc/init.d/jetty.
-  * Adjusted new location of servlet.jar. Closes: #280139.
-
- -- Philipp Meier <meier at fnogol.de>  Fri, 12 Aug 2005 18:14:28 +0200
-
-jetty (5.0.0-3) unstable; urgency=low
-
-  * Package is now maintained by pkg-java. Maintainer was updated.
-  * Disable validation of xml files in start.config by default.
-    Closes: #298731.
-  * Add /usr/lib/j2sdk1.5-sun to JAVA_HOME_DIRS in debian/rules.
-
- -- Philipp Meier <meier at fnogol.de>  Thu, 30 Jun 2005 14:32:31 +0200
-
-jetty (5.0.0-2.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Transition to liblog4j1.2-java.  Closes: #306761.
-
- -- Matej Vela <vela at debian.org>  Mon,  2 May 2005 12:12:12 +0200
-
-jetty (5.0.0-2) unstable; urgency=low
-
-  * Shipping working default configuration in /etc/jetty/jetty.xml.
-    Closes: #278134
-
- -- Philipp Meier <meier at fnogol.de>  Mon, 25 Oct 2004 11:52:25 +0200
-
-jetty (5.0.0-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Philipp Meier <meier at fnogol.de>  Thu, 16 Sep 2004 00:40:41 +0200
-
-jetty (4.2.22-2) unstable; urgency=low
-
-  * New upstream release.
-  * Changed mantainer email.
-
- -- Philipp Meier <meier at fnogol.de>  Wed, 25 Aug 2004 18:14:56 +0200
-
-jetty (4.2.21-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Philipp Meier <meier at meisterbohne.de>  Mon, 23 Aug 2004 15:23:25 +0200
-
-jetty (4.2.19-1) unstable; urgency=high
-
-  * New upstream release.
-  * Fixed DOS attack problem.
-
- -- Philipp Meier <meier at meisterbohne.de>  Fri, 19 Mar 2004 17:55:45 +0100
-
-jetty (4.2.18-1) unstable; urgency=low
-
-  * New upstream release.
-  * Package description of jetty-extra lists the
-    extensions provided. Closes: #232824
-
- -- Philipp Meier <meier at meisterbohne.de>  Mon,  1 Mar 2004 13:54:01 +0100
-
-jetty (4.2.15-1) unstable; urgency=low
-
-  * Adds missing javadoc to /usr/share/doc/
-  * Removes invalid libxdoclet-java from Build-Depends.
-  * Fixed clean target in upstreams extra build file. Building
-    jetty twice from the debianized source should work now.
-
- -- Philipp Meier <meier at meisterbohne.de>  Thu, 15 Jan 2004 14:00:13 +0100
-
-jetty (4.2.15) unstable; urgency=low
-
-  * New upstream release.
-  * New additional package jetty-extra.
-  * Updated standards version from 3.5.10 to 3.6.0
-  * Build target directory are no longer in debian because
-    the customization of the build process does not really pay off.
-
- -- Philipp Meier <meier at meisterbohne.de>  Wed, 14 Jan 2004 14:00:01 +0100
-
-jetty (4.2.12-2) unstable; urgency=low
-
-  * Fixes start.config to make jetty run with kaffe.
-  * Updated standards version from 3.5.8 to 3.5.10.
-
- -- Philipp Meier <meier at meisterbohne.de>  Fri, 29 Aug 2003 14:43:40 +0200
-
-jetty (4.2.12-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Philipp Meier <meier at meisterbohne.de>  Tue, 12 Aug 2003 14:07:56 +0200
-
-jetty (4.2.11-7) unstable; urgency=low
-
-  * Adds alternative dependency on j2sdk1.4.
-  * Fixes typos in debian/TODO.
-  * Adds ant to classpath because jasper needs it.
-
- -- Philipp Meier <meier at meisterbohne.de>  Thu,  7 Aug 2003 20:34:19 +0200
-
-jetty (4.2.11-6) unstable; urgency=low
-
-  * Removes DH_VERBOSE from debian/rules.
-  * /etc/jetty will be removed on purge.
-  * Add build-dependency on j2sdk1.4.
-
- -- Philipp Meier <meier at meisterbohne.de>  Wed, 23 Jul 2003 15:38:05 +0200
-
-jetty (4.2.11-5) unstable; urgency=low
-
-  * Fix for /etc/default/jetty which was misplaced.
-  * Fixes messed-up corrections for javadoc tags. Introduced before.
-
- -- Philipp Meier <meier at meisterbohne.de>  Wed, 23 Jul 2003 01:11:42 +0200
-
-jetty (4.2.11-4) unstable; urgency=low
-
-  * Jetty depends on j2re1.4 until build process of jetty
-    with java < 1.4 works.
-  * Fixes in build process.
-
- -- Philipp Meier <meier at meisterbohne.de>  Thu, 17 Jul 2003 12:56:14 +0200
-
-jetty (4.2.11-3) unstable; urgency=low
-
-  * Creates /usr/share/java/webapps if necessary.
-  * Not longer uses symlinks in ext but a debianized start.config.
-  * Changed to multiline logging.
-  * Removed demo webapps and provides a preliminary debian jetty root.
-  * Fixes /etc/defaults/jetty to be /etc/default/jetty.
-
- -- Philipp Meier <meier at meisterbohne.de>  Thu, 17 Jul 2003 12:56:03 +0200
-
-jetty (4.2.11-2) unstable; urgency=low
-
-  * Adds build dependencies on libmx4j-java and iblog4j-java.
-  * Removes comment about "Tomcat 4" from /etc/jetty.init.
-  * Renamed debian/{pre,post}{inst,rm} to debian/jetty.*
-  * Enables javac.debug to provide useful stackstraces.
-
- -- Philipp Meier <meier at meisterbohne.de>  Tue, 15 Jul 2003 21:50:36 +0200
-
-jetty (4.2.11-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Philipp Meier <meier at meisterbohne.de>  Mon, 14 Jul 2003 13:21:36 +0200
-

Copied: tags/jetty/6.1.24-3/debian/changelog (from rev 12553, trunk/jetty/debian/changelog)
===================================================================
--- tags/jetty/6.1.24-3/debian/changelog	                        (rev 0)
+++ tags/jetty/6.1.24-3/debian/changelog	2010-06-11 15:42:15 UTC (rev 12554)
@@ -0,0 +1,493 @@
+jetty (6.1.24-3) unstable; urgency=low
+
+  [ Torsten Werner ]
+  * Merge changes from Ubuntu version 6.1.22-1ubuntu1:
+    - debian/build.xml, debian/module.xml: Enable tests in the jetty module
+    - debian/rules: Adding slf4j-simple to the DEB_JARS since it's used in
+      tests
+    - debian/rules, debian/control: Added junit and ant-optional needed for
+      tests
+
+  [ Miguel Landaeta ]
+  * Enable jetty-plus and jetty-annotations modules. (Closes: #585387).
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 10 Jun 2010 14:07:51 -0430
+
+jetty (6.1.24-2) unstable; urgency=low
+
+  * Set JAVA_HOME in d/rules to /usr/lib/jvm/default-java. (Closes: #578618,
+    #579469)
+  * Fix the installation of jetty-util5.jar. (Closes: #569328)
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 29 Apr 2010 07:36:43 +0200
+
+jetty (6.1.24-1) unstable; urgency=low
+
+  [ Niels Thykier ]
+  * Reduced Depends on libjetty-java-doc to a Suggests. (Closes: #569293)
+  * Clarified what JETTY_HOST should be set to in order to accept all
+    connections. (Closes: #554874)
+  * Bumped Standards-Version to 3.8.4 - no changes required.
+
+  [ Torsten Werner ]
+  * New upstream release.
+  * Change Build-Depends: default-jdk. (Closes: #578618)
+  * Switch to source format 3.0.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 23 Apr 2010 23:55:35 +0200
+
+jetty (6.1.22-1ubuntu1) lucid; urgency=low
+
+  * debian/build.xml, debian/module.xml: Enable tests in the jetty module
+  * debian/rules: Adding slf4j-simple to the DEB_JARS since it's used in tests
+  * debian/rules, debian/control: Added junit and ant-optional needed for tests
+  * debian/control, debian/rules: Build with default-jdk.
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Tue, 26 Jan 2010 09:52:06 +0100
+
+jetty (6.1.22-1) unstable; urgency=medium
+
+  * New upstream release. (Closes: #553644)
+  * Added OSGi bundle metadata (by upstream). (Closes: #558187)
+  * Corrected path to jetty web-apps (by Niels Thykier). (Closes: #554877)
+
+ -- Pablo Duboue <pablo.duboue at gmail.com>  Sun, 13 Dec 2009 1:55:00 -0400
+  
+jetty (6.1.21-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Stopped using /tmp/jetty-temp in /etc/init.d/jetty for security
+    reasons.
+    - JVM_TMP is now /var/cache/jetty/tmp
+    - JETTY_TMP is now /var/cache/jetty/data
+  * The postrm script no longer deletes files in /tmp/jetty-temp.
+  * Removed Philipp Meier from Uploaders (last upload was 2006-06-07).
+    Thanks for your work on this package.
+  * Corrected javadoc symlink in binary package jetty.
+
+ -- Niels Thykier <niels at thykier.net>  Fri, 23 Oct 2009 20:45:43 +0200
+
+jetty (6.1.20-2) unstable; urgency=low
+
+  * Move documentation to /usr/share/doc/libjetty-java
+  * Better postinst and postrm scripts, aligned with tomcat6 scripts:
+     - postinst: user jetty is created with its own group
+     - postrm: better cleanup of temporary data,
+       thourough remove and purge of data
+  * debian/changelog:
+    - fix suggest for package libjetty-java-doc, add libjetty-java-doc
+      to the list of Suggests for libjetty-java
+    - add libjetty-extra to the list of Suggests for package jetty.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 07 Sep 2009 00:22:20 +0100
+
+jetty (6.1.20-1) unstable; urgency=medium
+
+  [ Niels Thykier ]
+  * New upstream release.
+  * Stop using Build-Depends-Indep, since the policy and the build
+    daemons disagree on when it should be used (Closes: #540861).
+  * Corrected jetty.install to reflect the move of some license files
+    in the source tree.
+  * Bumped to Standard-Versions 3.8.3 - no changes required.
+  * Updated jetty.post{install,rm} scripts to use "set -e" instead of
+    passing it to sh.
+  * Installed "VERSION.txt" as upstream changelog.
+  * A previous version (6.1.18-1) fixed the following security problems, which
+    were not mentioned in the changelog: CVE-2007-5613, CVE-2007-5614,
+    CVE-2007-5615, CVE-2009-1523, and CVE-2009-1524 (see below for more
+    information).
+
+  [ Torsten Werner ]
+  * Set urgency to medium because this version fixes a FTBFS.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 06 Sep 2009 23:06:45 +0200
+
+jetty (6.1.19-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 09 Aug 2009 08:48:10 +0200
+
+jetty (6.1.19-1) experimental; urgency=low
+
+  [ Ludovic Claude ]
+  * New upstream release fixing a security vulnerability
+    (cookies are not secure if you are running behind a netscaler).
+  * Remove the bootstrap patch as it has been added upstream and update
+    the build to use the new start-daemon component.
+  * Remove the Build-Depend on quilt as the patch is not needed anymore.
+  * Add the Maven POM to the package.
+  * Add a Build-Depends dependency on maven-repo-helper.
+  * Use mh_installpom and mh_installjar to install the POM and the jar to the
+    Maven repository.
+  * Add optional support for web applications located in /usr/share/webapps.
+  * Add a cron job that cleans up the old log files in /var/log/jetty.
+  * Register the Javadoc into Debian documentation and put it in a
+    separate package (libjetty-java-doc).
+  * Use openjdk-6-jdk for the build; add a Build-Depends on this
+    package. Required to build the javadoc.
+  * Update debian/copyright (patch provided by Jan Pascal Vanbest
+    <janpascal at vanbest.org>).
+
+  [ Torsten Werner ]
+  * Add myself to Uploaders.
+  * Update Standards-Version: 3.8.2.
+  * Move package libjetty-java-doc to Section: doc.
+  * Fix init script: check for /etc/default/rcS before reading it.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 14 Jul 2009 11:50:43 +0200
+
+jetty (6.1.18-1) unstable; urgency=low
+
+  [Ludovic Claude]
+  * Add myself to Uploaders.
+  * Change the build dependency on java-gcj to default-jdk.
+  * Add init.d startup script.
+  * Add dependencies on ant, libslf4j-java, libxerces2-java, libtomcat6-java
+    for libjetty-extra-java, add links for the lib folder.
+  * Add dependency on jsvc to run jetty as a daemon.
+  * Add the package libjetty-setuid-java for the Setuid module (with native
+    code).
+  * Add an index page used when Jetty starts.
+  * Use latest jasper from Tomcat to provide jsp 2.1 instead of
+    Glassfish JSP implementation as in the standard distribution.
+  * Add tools.jar to the classpath to be able to run JSP (Closes: #452586).
+  * Fix Lintian warnings: add ${misc:Depends} to all Depends.
+  * Move jetty to main as all its dependencies are in main,
+    and jetty contains only code that complies with Debian guidelines,
+    use java section like tomcat6
+    (Closes: #498582).
+  * Do not depend on tomcat 5.5 (Closes: #530720, #458399).
+  * Remove empty prerm and preinst scripts.
+  * Remove old patches that don't apply anymore.
+  * Update copyright and remove full text of Apache license.
+  * Bump up compat to 6 and Standards-Version to 3.8.1.
+
+  [David Yu]
+  * New upstream release for jetty
+    (Closes: #528389, #527571, #454529, #425152).
+  * Fixed jetty.links. Now delegates install of start.jar to libjetty-java.
+
+  [ Torsten Werner ]
+  * fixes several security issues:
+    - CVE-2007-5613: Cross-site scripting (XSS) vulnerability in Dump Servlet.
+    - CVE-2007-5614: Quote Sequence vulnerability.
+    - CVE-2007-5615: CRLF injection vulnerability.
+    - CVE-2009-1523: Directory traversal vulnerability in the HTTP server in
+    Mort Bay Jetty.
+    - CVE-2009-1524: Cross-site scripting (XSS) vulnerability in Mort
+    Bay Jetty.
+    (Closes: #454529, #528389, #527571, #543462).
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 12 Jun 2009 17:19:08 +0100
+
+jetty (5.1.14-1) unstable; urgency=low
+
+  * New upstream release.
+    - Removed debian/patches/cve-2007-6969.patch. Applied upstream.
+  * Added recognition of installed libcommons-el-java to debian/start.config.
+    Closes: #352093.
+  * Fixed short and long service description in debian/jetty.init.
+    Closes: #446788.
+  * Removed libapache2-mod-webapp from Suggests.
+  * Added watch file.
+
+ -- Michael Koch <konqueror at gmx.de>  Wed, 24 Oct 2007 14:14:45 +0200
+
+jetty (5.1.10-4) unstable; urgency=low
+
+  * Added patch to fix CVE-2006-6969. Thanks to Greg Wilkins for the patch.
+    Closes: #445283.
+  * Updated debian/patches/jdk-1.2-src-encoding.patch to make it work with
+    current ecj.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 05 Oct 2007 07:34:55 +0200
+
+jetty (5.1.10-3) unstable; urgency=low
+
+  * Fix debian/jetty.init to permit removal without purge and offer a new
+    NO_START option in /etc/default/jetty. Closes: #356067.
+    Thanks to Loic Minier for the patch.
+  * Added additional paths to JDK_DIRS in debian/jetty.init.
+    Closes: #405851.
+  * (Build-)Depends on java-gcj-compat.
+  * Moved debhelper from Build-Depends-Indep to Build-Depends.
+  * Removed Build-Depends on libtomcat5-java and replace Depends on
+    libtomcat5-java by libtomcat5.5-java.
+  * Added LSB section in debian/jetty.init.
+  * Removed extra license file from /usr/share/doc/jetty.
+  * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 24 Jul 2007 20:40:27 +0200
+
+jetty (5.1.10-2) unstable; urgency=low
+
+  * Fix in init script for new version of su (closes #367491).
+  * Create logfile if not existing. Aknolwedge NMU (closes #356066).
+
+ -- Philipp Meier <meier at fnogol.de>  Tue, 30 May 2006 10:46:21 +0200
+
+jetty (5.1.10-1) unstable; urgency=low
+
+  * New upstream release.
+  * Sercurity fixes for windows.
+  * Fixed path aliasing with // on windows.
+  * Fix for AJP13 with multiple headers.
+  * Fix for AJP13 with encoded path.
+  * Remove null dispatch attributes from getAttributeNames.
+  * Put POST content default back to iso_8859_1. GET is UTF-8
+    still.
+
+ -- Philipp Meier <meier at fnogol.de>  Tue, 30 May 2006 10:40:18 +0200
+
+jetty (5.1.8-3) unstable; urgency=low
+
+  * Enhance dependencies.
+
+ -- Philipp Meier <meier at fnogol.de>  Fri, 16 Dec 2005 10:53:48 +0100
+
+jetty (5.1.8-2) unstable; urgency=low
+
+  * Add dependeny on apache2-util for log rotation. Closes: #343177.
+
+ -- Philipp Meier <meier at fnogol.de>  Tue, 13 Dec 2005 14:28:09 +0100
+
+jetty (5.1.8-1) unstable; urgency=low
+
+  * New upstream release.
+
+  From 5.1.8:
+
+  * Fixed space in URL issued created in 5.1.6.
+
+  From 5.1.7:
+
+  * improved server stats.
+  * char encoding for MultiPartRequest.
+  * fixed merging of POST params in dispatch query string.
+  * protect from NPE in dispatcher getValues.
+  * Updated to 2.6.2 xerces.
+  * JSP file servlet mappings copy JspServlet init params.
+  * Prefix servlet context logs with org.mortbay.jetty.context.
+  * better support for URI character encodings.
+  * use commons logging jar instead of api jar.
+
+ -- Philipp Meier <meier at fnogol.de>  Wed,  7 Dec 2005 11:06:10 +0100
+
+jetty (5.1.6-1) unstable; urgency=high
+
+  * New upstream release.
+  * Fixed JSP visibility security issue in upstream.
+  * Fix location of jasper since upgrade to tomcat5. Closes: #333010.
+
+ -- Philipp Meier <meier at fnogol.de>  Wed, 30 Nov 2005 15:20:47 +0100
+
+jetty (5.1.5rc1-5) unstable; urgency=low
+
+  Patch from Oyvind Harboe <oyvind.harboe at zylin.com>:
+
+  * increased default amount of memory available to 256Mbyte.
+    the advantage of having more heap available is that more
+    applications will be able to run without modification to
+    the standard Jetty configuration.
+  * added -Djava.library.path=/usr/lib to VM arguments. This is
+    requried to make e.g. the librxtx-java package work.
+  * Closes: #32960.
+
+ -- Philipp Meier <meier at fnogol.de>  Thu, 22 Sep 2005 16:13:16 +0200
+
+jetty (5.1.5rc1-4) unstable; urgency=low
+
+  Patch from Oyvind Harboe <oyvind.harboe at zylin.com>:
+
+  * Fixed rc script /etc/init.d/jetty. "stop" could leave dangling
+    /var/run/jetty.pid. Fixed this by adding "--oknodo" to
+    "start-stop-daemon --stop" command.
+  * Removed trailing "/" from LOGDIR which caused
+    /var/log/out.log not to be created.
+  * /etc/init.d/jetty start will now deal more gracefully with a
+    dangling /var/run/jetty.pid. A dangling jetty.pid is detected
+    and ignored.
+  * Closes: #326176.
+
+ -- Philipp Meier <meier at fnogol.de>  Fri,  2 Sep 2005 13:40:59 +0200
+
+jetty (5.1.5rc1-3) unstable; urgency=low
+
+  * Removed -v from ant opts during build.
+  * Remove pid file on stop. Closes: #325667
+  * Fix location of ant-1.6.jar in start.config. Closes: #324472.
+
+ -- Philipp Meier <meier at fnogol.de>  Tue, 30 Aug 2005 13:37:15 +0200
+
+jetty (5.1.5rc1-2) unstable; urgency=low
+
+  * Builds with kaffe.
+  * Adds patch to exclude Sun JSSE if not available.
+
+ -- Philipp Meier <meier at fnogol.de>  Sat, 27 Aug 2005 14:21:12 +0200
+
+jetty (5.1.5rc1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Philipp Meier <meier at fnogol.de>  Fri, 26 Aug 2005 12:53:50 +0200
+
+jetty (5.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added myself to Uploaders in control.
+  * Standards-Version bumbed to 3.6.2.
+  * Removed debian/watch which will not work with sourceforge.
+  * Manage changes to upstream with cdbs simple-patchsys.
+  * Fixed rc script /etc/init.d/jetty.
+  * Adjusted new location of servlet.jar. Closes: #280139.
+
+ -- Philipp Meier <meier at fnogol.de>  Fri, 12 Aug 2005 18:14:28 +0200
+
+jetty (5.0.0-3) unstable; urgency=low
+
+  * Package is now maintained by pkg-java. Maintainer was updated.
+  * Disable validation of xml files in start.config by default.
+    Closes: #298731.
+  * Add /usr/lib/j2sdk1.5-sun to JAVA_HOME_DIRS in debian/rules.
+
+ -- Philipp Meier <meier at fnogol.de>  Thu, 30 Jun 2005 14:32:31 +0200
+
+jetty (5.0.0-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Transition to liblog4j1.2-java.  Closes: #306761.
+
+ -- Matej Vela <vela at debian.org>  Mon,  2 May 2005 12:12:12 +0200
+
+jetty (5.0.0-2) unstable; urgency=low
+
+  * Shipping working default configuration in /etc/jetty/jetty.xml.
+    Closes: #278134
+
+ -- Philipp Meier <meier at fnogol.de>  Mon, 25 Oct 2004 11:52:25 +0200
+
+jetty (5.0.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Philipp Meier <meier at fnogol.de>  Thu, 16 Sep 2004 00:40:41 +0200
+
+jetty (4.2.22-2) unstable; urgency=low
+
+  * New upstream release.
+  * Changed mantainer email.
+
+ -- Philipp Meier <meier at fnogol.de>  Wed, 25 Aug 2004 18:14:56 +0200
+
+jetty (4.2.21-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Mon, 23 Aug 2004 15:23:25 +0200
+
+jetty (4.2.19-1) unstable; urgency=high
+
+  * New upstream release.
+  * Fixed DOS attack problem.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Fri, 19 Mar 2004 17:55:45 +0100
+
+jetty (4.2.18-1) unstable; urgency=low
+
+  * New upstream release.
+  * Package description of jetty-extra lists the
+    extensions provided. Closes: #232824
+
+ -- Philipp Meier <meier at meisterbohne.de>  Mon,  1 Mar 2004 13:54:01 +0100
+
+jetty (4.2.15-1) unstable; urgency=low
+
+  * Adds missing javadoc to /usr/share/doc/
+  * Removes invalid libxdoclet-java from Build-Depends.
+  * Fixed clean target in upstreams extra build file. Building
+    jetty twice from the debianized source should work now.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Thu, 15 Jan 2004 14:00:13 +0100
+
+jetty (4.2.15) unstable; urgency=low
+
+  * New upstream release.
+  * New additional package jetty-extra.
+  * Updated standards version from 3.5.10 to 3.6.0
+  * Build target directory are no longer in debian because
+    the customization of the build process does not really pay off.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Wed, 14 Jan 2004 14:00:01 +0100
+
+jetty (4.2.12-2) unstable; urgency=low
+
+  * Fixes start.config to make jetty run with kaffe.
+  * Updated standards version from 3.5.8 to 3.5.10.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Fri, 29 Aug 2003 14:43:40 +0200
+
+jetty (4.2.12-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Tue, 12 Aug 2003 14:07:56 +0200
+
+jetty (4.2.11-7) unstable; urgency=low
+
+  * Adds alternative dependency on j2sdk1.4.
+  * Fixes typos in debian/TODO.
+  * Adds ant to classpath because jasper needs it.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Thu,  7 Aug 2003 20:34:19 +0200
+
+jetty (4.2.11-6) unstable; urgency=low
+
+  * Removes DH_VERBOSE from debian/rules.
+  * /etc/jetty will be removed on purge.
+  * Add build-dependency on j2sdk1.4.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Wed, 23 Jul 2003 15:38:05 +0200
+
+jetty (4.2.11-5) unstable; urgency=low
+
+  * Fix for /etc/default/jetty which was misplaced.
+  * Fixes messed-up corrections for javadoc tags. Introduced before.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Wed, 23 Jul 2003 01:11:42 +0200
+
+jetty (4.2.11-4) unstable; urgency=low
+
+  * Jetty depends on j2re1.4 until build process of jetty
+    with java < 1.4 works.
+  * Fixes in build process.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Thu, 17 Jul 2003 12:56:14 +0200
+
+jetty (4.2.11-3) unstable; urgency=low
+
+  * Creates /usr/share/java/webapps if necessary.
+  * Not longer uses symlinks in ext but a debianized start.config.
+  * Changed to multiline logging.
+  * Removed demo webapps and provides a preliminary debian jetty root.
+  * Fixes /etc/defaults/jetty to be /etc/default/jetty.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Thu, 17 Jul 2003 12:56:03 +0200
+
+jetty (4.2.11-2) unstable; urgency=low
+
+  * Adds build dependencies on libmx4j-java and iblog4j-java.
+  * Removes comment about "Tomcat 4" from /etc/jetty.init.
+  * Renamed debian/{pre,post}{inst,rm} to debian/jetty.*
+  * Enables javac.debug to provide useful stackstraces.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Tue, 15 Jul 2003 21:50:36 +0200
+
+jetty (4.2.11-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Philipp Meier <meier at meisterbohne.de>  Mon, 14 Jul 2003 13:21:36 +0200
+

Deleted: tags/jetty/6.1.24-3/debian/control
===================================================================
--- trunk/jetty/debian/control	2010-06-11 14:21:39 UTC (rev 12552)
+++ tags/jetty/6.1.24-3/debian/control	2010-06-11 15:42:15 UTC (rev 12554)
@@ -1,81 +0,0 @@
-Source: jetty
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>, Thierry Carrez <thierry.carrez at ubuntu.com>,
- Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>,
- Niels Thykier <niels at thykier.net>, Pablo Duboue <pablo.duboue at gmail.com>
-Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), default-jdk, ant-optional, maven-repo-helper,
- libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java,
- libgnujaf-java, libcommons-daemon-java, junit
-Standards-Version: 3.8.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jetty
-Homepage: http://jetty.mortbay.com/
-
-Package: libjetty-java
-Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, libservlet2.5-java, libslf4j-java
-Suggests: jetty, libjetty-java-doc
-Description: Java servlet engine and webserver -- core libraries
- Jetty is an Open Source HTTP Servlet Server written in 100% Java.
- It is designed to be light weight, high performance, embeddable,
- extensible and flexible, thus making it an ideal platform for serving
- dynamic HTTP requests from any Java application.
-
-Package: libjetty-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: libjetty-java
-Description: Javadoc for the Jetty API
- Jetty is an Open Source HTTP Servlet Server written in 100% Java.
- It is designed to be light weight, high performance, embeddable,
- extensible and flexible, thus making it an ideal platform for serving
- dynamic HTTP requests from any Java application.
- .
- This package contains the Javadoc for libjetty-java.
-
-Package: libjetty-extra-java
-Architecture: all
-Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), libmx4j-java, 
- libgnumail-java, libgnujaf-java, ant, libslf4j-java, libxerces2-java, 
- libtomcat6-java (>= 6.0.20-2)
-Recommends: libjetty-extra
-Suggests: jetty
-Description: Java servlet engine and webserver -- extra libraries
- Jetty is an Open Source HTTP Servlet Server written in 100% Java.
- It is designed to be light weight, high performance, embeddable,
- extensible and flexible, thus making it an ideal platform for serving
- dynamic HTTP requests from any Java application. 
- The extra libraries include jetty-management, jetty-naming,
- jetty-servlet-tester, jetty-ajp, jetty-java5-threadpool,
- jetty-client, jetty-rewrite-handler
-
-Package: libjetty-extra
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libjetty-extra-java (>= ${source:Version})
-Conflicts: libjetty-setuid-java
-Suggests: jetty
-Description: Java servlet engine and webserver -- extra libraries
- Jetty is an Open Source HTTP Servlet Server written in 100% Java.
- It is designed to be light weight, high performance, embeddable,
- extensible and flexible, thus making it an ideal platform for serving
- dynamic HTTP requests from any Java application. 
- This package contains the platform-dependent libraries used by Jetty.
- Currently it contains libsetuid.so which can be used to start Jetty as root
- so that privileged ports may be accessed and then switched to a non-root
- user for security.
-
-Package: jetty
-Architecture: all
-Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}),
- adduser, jsvc, apache2-utils
-Suggests: libjetty-extra-java (>= ${source:Version}), libjetty-extra (>= ${source:Version}),
- libjetty-java-doc (>= ${source:Version})
-Description: Java servlet engine and webserver
- Jetty is an Open Source HTTP Servlet Server written in 100% Java.
- It is designed to be light weight, high performance, embeddable,
- extensible and flexible, thus making it an ideal platform for serving
- dynamic HTTP requests from any Java application.

Copied: tags/jetty/6.1.24-3/debian/control (from rev 12553, trunk/jetty/debian/control)
===================================================================
--- tags/jetty/6.1.24-3/debian/control	                        (rev 0)
+++ tags/jetty/6.1.24-3/debian/control	2010-06-11 15:42:15 UTC (rev 12554)
@@ -0,0 +1,82 @@
+Source: jetty
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Michael Koch <konqueror at gmx.de>, Thierry Carrez <thierry.carrez at ubuntu.com>,
+ Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>,
+ Niels Thykier <niels at thykier.net>, Pablo Duboue <pablo.duboue at gmail.com>
+Build-Depends: debhelper (>= 6), cdbs (>> 0.4.5.3), default-jdk, ant-optional, maven-repo-helper,
+ libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java,
+ libgnujaf-java, libcommons-daemon-java, junit, libgeronimo-jta-1.0.1b-spec-java,
+ libtomcat6-java
+Standards-Version: 3.8.4
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jetty
+Homepage: http://jetty.mortbay.com/
+
+Package: libjetty-java
+Architecture: all
+Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, libservlet2.5-java, libslf4j-java
+Suggests: jetty, libjetty-java-doc
+Description: Java servlet engine and webserver -- core libraries
+ Jetty is an Open Source HTTP Servlet Server written in 100% Java.
+ It is designed to be light weight, high performance, embeddable,
+ extensible and flexible, thus making it an ideal platform for serving
+ dynamic HTTP requests from any Java application.
+
+Package: libjetty-java-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: libjetty-java
+Description: Javadoc for the Jetty API
+ Jetty is an Open Source HTTP Servlet Server written in 100% Java.
+ It is designed to be light weight, high performance, embeddable,
+ extensible and flexible, thus making it an ideal platform for serving
+ dynamic HTTP requests from any Java application.
+ .
+ This package contains the Javadoc for libjetty-java.
+
+Package: libjetty-extra-java
+Architecture: all
+Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}), libmx4j-java, 
+ libgnumail-java, libgnujaf-java, ant, libslf4j-java, libxerces2-java, 
+ libtomcat6-java (>= 6.0.20-2), libgeronimo-jta-1.0.1b-spec-java
+Recommends: libjetty-extra
+Suggests: jetty
+Description: Java servlet engine and webserver -- extra libraries
+ Jetty is an Open Source HTTP Servlet Server written in 100% Java.
+ It is designed to be light weight, high performance, embeddable,
+ extensible and flexible, thus making it an ideal platform for serving
+ dynamic HTTP requests from any Java application. 
+ The extra libraries include jetty-management, jetty-naming,
+ jetty-servlet-tester, jetty-ajp, jetty-java5-threadpool,
+ jetty-client, jetty-rewrite-handler, jetty-plus, jetty-annotations
+
+Package: libjetty-extra
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libjetty-extra-java (>= ${source:Version})
+Conflicts: libjetty-setuid-java
+Suggests: jetty
+Description: Java servlet engine and webserver -- extra libraries
+ Jetty is an Open Source HTTP Servlet Server written in 100% Java.
+ It is designed to be light weight, high performance, embeddable,
+ extensible and flexible, thus making it an ideal platform for serving
+ dynamic HTTP requests from any Java application. 
+ This package contains the platform-dependent libraries used by Jetty.
+ Currently it contains libsetuid.so which can be used to start Jetty as root
+ so that privileged ports may be accessed and then switched to a non-root
+ user for security.
+
+Package: jetty
+Architecture: all
+Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}),
+ adduser, jsvc, apache2-utils
+Suggests: libjetty-extra-java (>= ${source:Version}), libjetty-extra (>= ${source:Version}),
+ libjetty-java-doc (>= ${source:Version})
+Description: Java servlet engine and webserver
+ Jetty is an Open Source HTTP Servlet Server written in 100% Java.
+ It is designed to be light weight, high performance, embeddable,
+ extensible and flexible, thus making it an ideal platform for serving
+ dynamic HTTP requests from any Java application.

Deleted: tags/jetty/6.1.24-3/debian/jetty-extra.conf
===================================================================
--- trunk/jetty/debian/jetty-extra.conf	2010-06-11 14:21:39 UTC (rev 12552)
+++ tags/jetty/6.1.24-3/debian/jetty-extra.conf	2010-06-11 15:42:15 UTC (rev 12554)
@@ -1,11 +0,0 @@
-# list of jetty configuration and property files
-# Replace jetty.conf with this file to use the extra features
-/etc/jetty/jetty-logging.xml
-/etc/jetty/jetty-jmx.xml
-/etc/jetty/jetty.xml
-/etc/jetty/jetty-shared-webapps.xml
-# not available yet - /etc/jetty/jetty-plus.xml
-/etc/jetty/jetty-ajp.xml
-/etc/jetty/jetty-ssl.xml
-/etc/jetty/jetty-sslengine.xml
-/etc/jetty/jetty-stats.xml

Copied: tags/jetty/6.1.24-3/debian/jetty-extra.conf (from rev 12553, trunk/jetty/debian/jetty-extra.conf)
===================================================================
--- tags/jetty/6.1.24-3/debian/jetty-extra.conf	                        (rev 0)
+++ tags/jetty/6.1.24-3/debian/jetty-extra.conf	2010-06-11 15:42:15 UTC (rev 12554)
@@ -0,0 +1,11 @@
+# list of jetty configuration and property files
+# Replace jetty.conf with this file to use the extra features
+/etc/jetty/jetty-logging.xml
+/etc/jetty/jetty-jmx.xml
+/etc/jetty/jetty.xml
+/etc/jetty/jetty-shared-webapps.xml
+/etc/jetty/jetty-plus.xml
+/etc/jetty/jetty-ajp.xml
+/etc/jetty/jetty-ssl.xml
+/etc/jetty/jetty-sslengine.xml
+/etc/jetty/jetty-stats.xml

Deleted: tags/jetty/6.1.24-3/debian/libjetty-extra-java.dirs
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.dirs	2010-06-11 14:21:39 UTC (rev 12552)
+++ tags/jetty/6.1.24-3/debian/libjetty-extra-java.dirs	2010-06-11 15:42:15 UTC (rev 12554)
@@ -1,5 +0,0 @@
-usr/share/jetty/lib/ext
-usr/share/jetty/lib/management
-usr/share/jetty/lib/management/mx4j
-usr/share/jetty/lib/naming
-usr/share/jetty/lib/jsp-2.1

Copied: tags/jetty/6.1.24-3/debian/libjetty-extra-java.dirs (from rev 12553, trunk/jetty/debian/libjetty-extra-java.dirs)
===================================================================
--- tags/jetty/6.1.24-3/debian/libjetty-extra-java.dirs	                        (rev 0)
+++ tags/jetty/6.1.24-3/debian/libjetty-extra-java.dirs	2010-06-11 15:42:15 UTC (rev 12554)
@@ -0,0 +1,6 @@
+usr/share/jetty/lib/ext
+usr/share/jetty/lib/management
+usr/share/jetty/lib/management/mx4j
+usr/share/jetty/lib/naming
+usr/share/jetty/lib/jsp-2.1
+usr/share/jetty/lib/plus

Deleted: tags/jetty/6.1.24-3/debian/libjetty-extra-java.links
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.links	2010-06-11 14:21:39 UTC (rev 12552)
+++ tags/jetty/6.1.24-3/debian/libjetty-extra-java.links	2010-06-11 15:42:15 UTC (rev 12554)
@@ -1,16 +0,0 @@
-usr/share/java/mx4j.jar            usr/share/jetty/lib/management/mx4j/mx4j.jar
-usr/share/java/mx4j-tools.jar      usr/share/jetty/lib/management/mx4j/mx4j-tools.jar
-usr/share/java/activation.jar      usr/share/jetty/lib/naming/activation.jar
-usr/share/java/gnumail.jar         usr/share/jetty/lib/naming/mail.jar
-usr/share/java/ant.jar             usr/share/jetty/lib/jsp-2.1/ant.jar
-usr/share/java/ant-launcher.jar    usr/share/jetty/lib/jsp-2.1/ant-launcher.jar
-usr/share/java/jasper.jar          usr/share/jetty/lib/jsp-2.1/jasper.jar
-usr/share/java/jsp-api-2.1.jar     usr/share/jetty/lib/jsp-2.1/jsp-api.jar
-usr/share/java/el-api-2.1.jar      usr/share/jetty/lib/jsp-2.1/el-api.jar
-usr/share/java/jasper-el.jar       usr/share/jetty/lib/jsp-2.1/commons-el.jar
-usr/share/java/tomcat-juli.jar     usr/share/jetty/lib/jsp-2.1/tomcat-juli.jar
-usr/share/java/jcl-over-slf4j.jar  usr/share/jetty/lib/jsp-2.1/jcl-over-slf4j.jar
-usr/share/java/slf4j-api.jar       usr/share/jetty/lib/jsp-2.1/slf4j-api.jar
-usr/share/java/slf4j-simple.jar    usr/share/jetty/lib/jsp-2.1/slf4j-simple.jar
-usr/share/java/xercesImpl.jar      usr/share/jetty/lib/jsp-2.1/xercesImpl.jar
-usr/share/java/xmlParserAPIs.jar   usr/share/jetty/lib/jsp-2.1/xmlParserAPIs.jar

Copied: tags/jetty/6.1.24-3/debian/libjetty-extra-java.links (from rev 12553, trunk/jetty/debian/libjetty-extra-java.links)
===================================================================
--- tags/jetty/6.1.24-3/debian/libjetty-extra-java.links	                        (rev 0)
+++ tags/jetty/6.1.24-3/debian/libjetty-extra-java.links	2010-06-11 15:42:15 UTC (rev 12554)
@@ -0,0 +1,18 @@
+usr/share/java/mx4j.jar            usr/share/jetty/lib/management/mx4j/mx4j.jar
+usr/share/java/mx4j-tools.jar      usr/share/jetty/lib/management/mx4j/mx4j-tools.jar
+usr/share/java/activation.jar      usr/share/jetty/lib/naming/activation.jar
+usr/share/java/gnumail.jar         usr/share/jetty/lib/naming/mail.jar
+usr/share/java/ant.jar             usr/share/jetty/lib/jsp-2.1/ant.jar
+usr/share/java/ant-launcher.jar    usr/share/jetty/lib/jsp-2.1/ant-launcher.jar
+usr/share/java/jasper.jar          usr/share/jetty/lib/jsp-2.1/jasper.jar
+usr/share/java/jsp-api-2.1.jar     usr/share/jetty/lib/jsp-2.1/jsp-api.jar
+usr/share/java/el-api-2.1.jar      usr/share/jetty/lib/jsp-2.1/el-api.jar
+usr/share/java/jasper-el.jar       usr/share/jetty/lib/jsp-2.1/commons-el.jar
+usr/share/java/tomcat-juli.jar     usr/share/jetty/lib/jsp-2.1/tomcat-juli.jar
+usr/share/java/jcl-over-slf4j.jar  usr/share/jetty/lib/jsp-2.1/jcl-over-slf4j.jar
+usr/share/java/slf4j-api.jar       usr/share/jetty/lib/jsp-2.1/slf4j-api.jar
+usr/share/java/slf4j-simple.jar    usr/share/jetty/lib/jsp-2.1/slf4j-simple.jar
+usr/share/java/xercesImpl.jar      usr/share/jetty/lib/jsp-2.1/xercesImpl.jar
+usr/share/java/xmlParserAPIs.jar   usr/share/jetty/lib/jsp-2.1/xmlParserAPIs.jar
+usr/share/java/annotations-api.jar           usr/share/jetty/lib/annotations-api.jar
+usr/share/java/geronimo-jta-1.0.1b-spec.jar  usr/share/jetty/lib/geronimo-jta-1.0.1b-spec.jar

Deleted: tags/jetty/6.1.24-3/debian/libjetty-extra-java.poms
===================================================================
--- trunk/jetty/debian/libjetty-extra-java.poms	2010-06-11 14:21:39 UTC (rev 12552)
+++ tags/jetty/6.1.24-3/debian/libjetty-extra-java.poms	2010-06-11 15:42:15 UTC (rev 12554)
@@ -1,11 +0,0 @@
-modules/html/pom.xml
-modules/management/pom.xml
-modules/naming/pom.xml
-extras/servlet-tester/pom.xml
-extras/ajp/pom.xml
-extras/threadpool/pom.xml
-extras/client/pom.xml
-contrib/jetty-rewrite-handler/pom.xml
-extras/setuid/pom.xml
-extras/setuid/modules/java/pom.xml
-

Copied: tags/jetty/6.1.24-3/debian/libjetty-extra-java.poms (from rev 12553, trunk/jetty/debian/libjetty-extra-java.poms)
===================================================================
--- tags/jetty/6.1.24-3/debian/libjetty-extra-java.poms	                        (rev 0)
+++ tags/jetty/6.1.24-3/debian/libjetty-extra-java.poms	2010-06-11 15:42:15 UTC (rev 12554)
@@ -0,0 +1,13 @@
+modules/html/pom.xml
+modules/management/pom.xml
+modules/naming/pom.xml
+extras/servlet-tester/pom.xml
+extras/ajp/pom.xml
+extras/threadpool/pom.xml
+extras/client/pom.xml
+contrib/jetty-rewrite-handler/pom.xml
+extras/setuid/pom.xml
+extras/setuid/modules/java/pom.xml
+modules/plus/pom.xml
+modules/annotations/pom.xml
+

Deleted: tags/jetty/6.1.24-3/debian/rules
===================================================================
--- trunk/jetty/debian/rules	2010-06-11 14:21:39 UTC (rev 12552)
+++ tags/jetty/6.1.24-3/debian/rules	2010-06-11 15:42:15 UTC (rev 12554)
@@ -1,61 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := servlet-api-2.5 slf4j-api slf4j-simple mx4j mx4j-tools gnumail activation commons-daemon junit ant-junit
-DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_ARGS         := -DVERSION=$(VERSION) -Dbuild.sysclasspath=last
-DEB_INSTALL_CHANGELOGS_ALL := VERSION.txt
-#API_DOCS             := javadoc/
-
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-util modules/util/pom.xml lib/jetty-util-$(VERSION).jar /usr/share/jetty/lib/jetty-util.jar
-	mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-util5 modules/util5/pom.xml lib/util5/jetty-util5-$(VERSION).jar /usr/share/jetty/jre1.5/jetty-util5-$(VERSION).jar  usr/share/jetty/lib/jre1.5/jetty-util5.jar
-	mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty modules/jetty/pom.xml lib/jetty-$(VERSION).jar /usr/share/jetty/lib/jetty.jar
-	mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-sslengine extras/sslengine/pom.xml lib/sslengine/jetty-sslengine-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-sslengine.jar
-	mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-start modules/start/pom.xml start.jar /usr/share/jetty/start.jar
-	mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-start-daemon contrib/start-daemon/pom.xml start-daemon.jar /usr/share/jetty/start-daemon.jar
-
-binary-post-install/lib$(PACKAGE)-extra-java::
-	mh_installpoms -plib$(PACKAGE)-extra-java
-	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-html modules/html/pom.xml lib/ext/jetty-html-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-html.jar
-	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-management modules/management/pom.xml lib/management/jetty-management-$(VERSION).jar /usr/share/jetty/lib/management/jetty-management.jar
-	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-naming modules/naming/pom.xml lib/naming/jetty-naming-$(VERSION).jar /usr/share/jetty/lib/naming/jetty-naming.jar
-	#mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-plus modules/plus/pom.xml lib/plus/jetty-plus-$(VERSION).jar /usr/share/jetty/lib/plus/jetty-plus.jar
-	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-servlet-tester extras/servlet-tester/pom.xml lib/ext/jetty-servlet-tester-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-servlet-tester.jar
-	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-ajp extras/ajp/pom.xml lib/ext/jetty-ajp-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-ajp.jar
-	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-java5-threadpool extras/threadpool/pom.xml lib/ext/jetty-java5-threadpool-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-java5-threadpool.jar
-	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-client extras/client/pom.xml lib/ext/jetty-client-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-client.jar
-	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-rewrite-handler contrib/jetty-rewrite-handler/pom.xml lib/ext/jetty-rewrite-handler-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-rewrite-handler.jar
-	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-setuid extras/setuid/modules/java/pom.xml lib/ext/jetty-setuid-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-setuid.jar
-
-extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.c:
-	cd extras/setuid && install -D modules/native/src/main/native/org_mortbay_setuid_SetUID.c modules/native/target/generated/org_mortbay_setuid_SetUID.c
-
-extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.h: extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.c
-	cd extras/setuid && javah -d modules/native/target/generated -classpath ../../lib/ext/jetty-setuid-$(VERSION).jar org.mortbay.setuid.SetUID
-
-lib/ext/libsetuid.so: extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.h
-	cd extras/setuid && gcc -I$(JAVA_HOME)/include/ -I$(JAVA_HOME)/include/linux/  \
-		-shared modules/native/target/generated/org_mortbay_setuid_SetUID.c -fPIC -O \
-		-o ../../lib/ext/libsetuid.so
-
-build/lib$(PACKAGE)-extra:: lib/ext/libsetuid.so
-
-binary-post-install/lib$(PACKAGE)-extra::
-	mh_installpoms -plib$(PACKAGE)-extra
-	dh_install -plib$(PACKAGE)-extra --sourcedir=lib/ext libsetuid.so /usr/lib/jetty
-	dh_link -plib$(PACKAGE)-extra /usr/lib/jetty/libsetuid.so /usr/share/jetty/lib/ext/libsetuid.so
-
-get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-# No documentation released yet.
-#binary-post-install/$(PACKAGE)-doc::
-

Copied: tags/jetty/6.1.24-3/debian/rules (from rev 12553, trunk/jetty/debian/rules)
===================================================================
--- tags/jetty/6.1.24-3/debian/rules	                        (rev 0)
+++ tags/jetty/6.1.24-3/debian/rules	2010-06-11 15:42:15 UTC (rev 12554)
@@ -0,0 +1,62 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := servlet-api-2.5 slf4j-api slf4j-simple mx4j mx4j-tools gnumail activation commons-daemon junit ant-junit geronimo-jta-1.0.1b-spec annotations-api
+DEB_ANT_BUILD_TARGET := package
+DEB_ANT_BUILDFILE    := debian/build.xml
+DEB_ANT_ARGS         := -DVERSION=$(VERSION) -Dbuild.sysclasspath=last
+DEB_INSTALL_CHANGELOGS_ALL := VERSION.txt
+#API_DOCS             := javadoc/
+
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-util modules/util/pom.xml lib/jetty-util-$(VERSION).jar /usr/share/jetty/lib/jetty-util.jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-util5 modules/util5/pom.xml lib/util5/jetty-util5-$(VERSION).jar /usr/share/jetty/jre1.5/jetty-util5-$(VERSION).jar  usr/share/jetty/lib/jre1.5/jetty-util5.jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty modules/jetty/pom.xml lib/jetty-$(VERSION).jar /usr/share/jetty/lib/jetty.jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-sslengine extras/sslengine/pom.xml lib/sslengine/jetty-sslengine-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-sslengine.jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-start modules/start/pom.xml start.jar /usr/share/jetty/start.jar
+	mh_installjar -plib$(PACKAGE)-java -l --usj-name=jetty-start-daemon contrib/start-daemon/pom.xml start-daemon.jar /usr/share/jetty/start-daemon.jar
+
+binary-post-install/lib$(PACKAGE)-extra-java::
+	mh_installpoms -plib$(PACKAGE)-extra-java
+	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-html modules/html/pom.xml lib/ext/jetty-html-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-html.jar
+	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-management modules/management/pom.xml lib/management/jetty-management-$(VERSION).jar /usr/share/jetty/lib/management/jetty-management.jar
+	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-naming modules/naming/pom.xml lib/naming/jetty-naming-$(VERSION).jar /usr/share/jetty/lib/naming/jetty-naming.jar
+	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-plus modules/plus/pom.xml lib/plus/jetty-plus-$(VERSION).jar /usr/share/jetty/lib/plus/jetty-plus.jar
+	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-servlet-tester extras/servlet-tester/pom.xml lib/ext/jetty-servlet-tester-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-servlet-tester.jar
+	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-ajp extras/ajp/pom.xml lib/ext/jetty-ajp-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-ajp.jar
+	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-java5-threadpool extras/threadpool/pom.xml lib/ext/jetty-java5-threadpool-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-java5-threadpool.jar
+	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-client extras/client/pom.xml lib/ext/jetty-client-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-client.jar
+	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-rewrite-handler contrib/jetty-rewrite-handler/pom.xml lib/ext/jetty-rewrite-handler-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-rewrite-handler.jar
+	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-setuid extras/setuid/modules/java/pom.xml lib/ext/jetty-setuid-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-setuid.jar
+	mh_installjar -plib$(PACKAGE)-extra-java -l --usj-name=jetty-annotations modules/annotations/pom.xml lib/ext/jetty-annotations-$(VERSION).jar /usr/share/jetty/lib/ext/jetty-annotations.jar
+
+extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.c:
+	cd extras/setuid && install -D modules/native/src/main/native/org_mortbay_setuid_SetUID.c modules/native/target/generated/org_mortbay_setuid_SetUID.c
+
+extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.h: extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.c
+	cd extras/setuid && javah -d modules/native/target/generated -classpath ../../lib/ext/jetty-setuid-$(VERSION).jar org.mortbay.setuid.SetUID
+
+lib/ext/libsetuid.so: extras/setuid/modules/native/target/generated/org_mortbay_setuid_SetUID.h
+	cd extras/setuid && gcc -I$(JAVA_HOME)/include/ -I$(JAVA_HOME)/include/linux/  \
+		-shared modules/native/target/generated/org_mortbay_setuid_SetUID.c -fPIC -O \
+		-o ../../lib/ext/libsetuid.so
+
+build/lib$(PACKAGE)-extra:: lib/ext/libsetuid.so
+
+binary-post-install/lib$(PACKAGE)-extra::
+	mh_installpoms -plib$(PACKAGE)-extra
+	dh_install -plib$(PACKAGE)-extra --sourcedir=lib/ext libsetuid.so /usr/lib/jetty
+	dh_link -plib$(PACKAGE)-extra /usr/lib/jetty/libsetuid.so /usr/share/jetty/lib/ext/libsetuid.so
+
+get-orig-source:
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
+# No documentation released yet.
+#binary-post-install/$(PACKAGE)-doc::
+




More information about the pkg-java-commits mailing list