[pkg-java] r12693 - in tags/jetty: . 6.1.24-5/debian
Torsten Werner
twerner at alioth.debian.org
Tue Jun 29 19:09:27 UTC 2010
Author: twerner
Date: 2010-06-29 19:09:22 +0000 (Tue, 29 Jun 2010)
New Revision: 12693
Added:
tags/jetty/6.1.24-5/
tags/jetty/6.1.24-5/debian/changelog
tags/jetty/6.1.24-5/debian/module.xml
tags/jetty/6.1.24-5/debian/rules
Removed:
tags/jetty/6.1.24-5/debian/changelog
tags/jetty/6.1.24-5/debian/module.xml
tags/jetty/6.1.24-5/debian/rules
Log:
[svn-buildpackage] Tagging jetty 6.1.24-5
Deleted: tags/jetty/6.1.24-5/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog 2010-06-28 21:16:25 UTC (rev 12689)
+++ tags/jetty/6.1.24-5/debian/changelog 2010-06-29 19:09:22 UTC (rev 12693)
@@ -1,505 +0,0 @@
-jetty (6.1.24-4) unstable; urgency=low
-
- * Updated the versions in the Manifests to match the actual version
- of jetty.
- * Remove all use of sudo in jetty.init. (Closes: #580639)
- * Fixed some formatting issues in the NEWS file.
- * Bumped debhelper compat to 7.
- * Made the javadoc link against system javadocs. This includes adding
- Recommends on various java-doc packages.
-
- -- Niels Thykier <niels at thykier.net> Sun, 20 Jun 2010 14:49:32 +0200
-
-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
-
Copied: tags/jetty/6.1.24-5/debian/changelog (from rev 12692, trunk/jetty/debian/changelog)
===================================================================
--- tags/jetty/6.1.24-5/debian/changelog (rev 0)
+++ tags/jetty/6.1.24-5/debian/changelog 2010-06-29 19:09:22 UTC (rev 12693)
@@ -0,0 +1,512 @@
+jetty (6.1.24-5) unstable; urgency=low
+
+ * Ignore test failures. (Closes: #587459)
+ * Remove debian/.mh in clean target.
+
+ -- Torsten Werner <twerner at debian.org> Tue, 29 Jun 2010 20:53:42 +0200
+
+jetty (6.1.24-4) unstable; urgency=low
+
+ * Updated the versions in the Manifests to match the actual version
+ of jetty.
+ * Remove all use of sudo in jetty.init. (Closes: #580639)
+ * Fixed some formatting issues in the NEWS file.
+ * Bumped debhelper compat to 7.
+ * Made the javadoc link against system javadocs. This includes adding
+ Recommends on various java-doc packages.
+
+ -- Niels Thykier <niels at thykier.net> Sun, 20 Jun 2010 14:49:32 +0200
+
+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-5/debian/module.xml
===================================================================
--- trunk/jetty/debian/module.xml 2010-06-28 21:16:25 UTC (rev 12689)
+++ tags/jetty/6.1.24-5/debian/module.xml 2010-06-29 19:09:22 UTC (rev 12693)
@@ -1,179 +0,0 @@
-<project name="jetty module build" basedir="." default="package">
- <property name="jar.file" value="${module-name}-${module-version}.jar"/>
- <property name="javac.excludes" value=""/>
- <target name="package">
- <delete dir="${build.dir}"/>
- <mkdir dir="${build.dir}"/>
-
- <echo>generating javadoc for ${module-name}</echo>
- <javadoc packagenames="org.mortbay.*,javax.servlet.*"
- destdir="${javadoc.dir}"
- author="true"
- version="true"
- public="false"
- windowtitle="jetty-${module-version} API"
- doctitle="${module-name}-${module-version}"
- encoding="ISO-8859-1"
- bottom="Copyright &copy; 2009 Mortbay Consulting Pty. Ltd. All Rights Reserved.">
- <classpath>
- <path refid="classpath"/>
- </classpath>
- <link href="/usr/share/doc/default-jdk-doc/api/" />
- <link href="/usr/share/doc/libgnumail-java/api/" />
- <link href="/usr/share/doc/libservlet2.5-java/api/" />
- <sourcepath>
- <pathelement path="${src.dir}"/>
- </sourcepath>
- </javadoc>
-
- <echo>compiling ${module-name}</echo>
- <javac srcdir="${src.dir}"
- classpathref="classpath"
- destdir="${build.dir}"
- deprecation="false"
- failonerror="true"
- debug="true"
- source="1.5"
- target="1.5"
- nowarn="true"
- excludes="${javac.excludes}"
- listfiles="true"/>
-
- <echo>generating ${jar.file}</echo>
- <property name="manifest.file" value="${rsrc.dir}/META-INF/MANIFEST.MF"/>
- <available file="${manifest.file}" type="file" property="manifest.file.exists"/>
- <available file="${rsrc.dir}" type="dir" property="rsrc.dir.exists"/>
- <antcall target="generate-jar-with-given-manifest"/>
- <antcall target="generate-jar-without-given-manifest"/>
-
- <echo>copying ${jar.file} to ${module-libdir}</echo>
- <copy file="${target.dir}/${jar.file}" todir="${module-libdir}"/>
-
- <available file="${config.dir}" type="dir" property="config.dir.exists"/>
- <antcall target="copy-to-etc"/>
- <antcall target="tests" inheritRefs="true"/>
- </target>
-
- <target name="generate-jar" unless="jar.main.class">
- <antcall target="jar-with-resources"/>
- <antcall target="jar"/>
- </target>
-
- <target name="generate-jar-with-given-manifest" if="manifest.file.exists">
- <antcall target="jar-with-given-manifest-and-resources"/>
- <antcall target="jar-with-given-manifest"/>
- </target>
-
- <target name="generate-jar-without-given-manifest" unless="manifest.file.exists">
- <antcall target="generate-jar-with-manifest"/>
- <antcall target="generate-jar"/>
- </target>
-
- <target name="generate-jar-with-manifest" if="jar.main.class">
- <antcall target="jar-with-manifest-and-resources"/>
- <antcall target="jar-with-manifest"/>
- </target>
-
- <target name="jar" unless="rsrc.dir.exists">
- <jar destfile="${target.dir}/${jar.file}">
- <fileset dir="${build.dir}">
- <include name="**/*"/>
- </fileset>
- </jar>
- </target>
-
- <target name="jar-with-resources" if="rsrc.dir.exists">
- <jar destfile="${target.dir}/${jar.file}">
- <fileset dir="${build.dir}">
- <include name="**/*"/>
- </fileset>
- <fileset dir="${rsrc.dir}">
- <include name="**/*"/>
- </fileset>
- </jar>
- </target>
-
- <target name="jar-with-manifest" unless="rsrc.dir.exists">
- <jar destfile="${target.dir}/${jar.file}">
- <fileset dir="${build.dir}">
- <include name="**/*"/>
- </fileset>
- <manifest>
- <attribute name="Main-Class" value="${jar.main.class}"/>
- </manifest>
- </jar>
- </target>
-
- <target name="jar-with-manifest-and-resources" if="rsrc.dir.exists">
- <jar destfile="${target.dir}/${jar.file}">
- <fileset dir="${build.dir}">
- <include name="**/*"/>
- </fileset>
- <fileset dir="${rsrc.dir}">
- <include name="**/*"/>
- </fileset>
- <manifest>
- <attribute name="Main-Class" value="${jar.main.class}"/>
- </manifest>
- </jar>
- </target>
-
- <target name="jar-with-given-manifest" unless="rsrc.dir.exists">
- <jar destfile="${target.dir}/${jar.file}" manifest="${manifest.file}">
- <fileset dir="${build.dir}">
- <include name="**/*"/>
- </fileset>
- <fileset dir="${rsrc.dir}">
- <include name="**/*"/>
- </fileset>
- </jar>
- </target>
-
- <target name="jar-with-given-manifest-and-resources" if="rsrc.dir.exists">
- <jar destfile="${target.dir}/${jar.file}" manifest="${manifest.file}">
- <fileset dir="${build.dir}">
- <include name="**/*"/>
- </fileset>
- <fileset dir="${rsrc.dir}">
- <include name="**/*"/>
- </fileset>
- </jar>
- </target>
-
- <target name="copy-to-etc" if="config.dir.exists">
- <echo>copying ${config.dir} to ${etc.dir} from ${module-name}</echo>
- <copy todir="${etc.dir}">
- <fileset dir="${config.dir}" excludes="**/*.svn"/>
- </copy>
- </target>
-
- <target name="tests" if="run-tests">
- <javac srcdir="${test.dir}"
- classpathref="classpath"
- deprecation="false"
- failonerror="true"
- debug="true"
- source="1.5"
- target="1.5"
- nowarn="true"
- listfiles="true"/>
- <junit haltonfailure="yes">
- <classpath>
- <path refid="classpath"/>
- <pathelement path="${test.dir}"/>
- </classpath>
- <formatter type="plain" usefile="false"/>
- <batchtest>
- <fileset dir="${test.dir}">
- <include name="**/*Test.java"/>
- <include name="**/*TestCase.java"/>
- <exclude name="org/mortbay/jetty/servlet/AbstractSessionTest.java"/>
- <exclude name="org/mortbay/jetty/AsyncStressTest.java"/>
- <exclude name="org/mortbay/resource/*.java"/>
- <exclude name="org/mortbay/xml/XmlConfigurationTest.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-</project>
-
Copied: tags/jetty/6.1.24-5/debian/module.xml (from rev 12692, trunk/jetty/debian/module.xml)
===================================================================
--- tags/jetty/6.1.24-5/debian/module.xml (rev 0)
+++ tags/jetty/6.1.24-5/debian/module.xml 2010-06-29 19:09:22 UTC (rev 12693)
@@ -0,0 +1,179 @@
+<project name="jetty module build" basedir="." default="package">
+ <property name="jar.file" value="${module-name}-${module-version}.jar"/>
+ <property name="javac.excludes" value=""/>
+ <target name="package">
+ <delete dir="${build.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <echo>generating javadoc for ${module-name}</echo>
+ <javadoc packagenames="org.mortbay.*,javax.servlet.*"
+ destdir="${javadoc.dir}"
+ author="true"
+ version="true"
+ public="false"
+ windowtitle="jetty-${module-version} API"
+ doctitle="${module-name}-${module-version}"
+ encoding="ISO-8859-1"
+ bottom="Copyright &copy; 2009 Mortbay Consulting Pty. Ltd. All Rights Reserved.">
+ <classpath>
+ <path refid="classpath"/>
+ </classpath>
+ <link href="/usr/share/doc/default-jdk-doc/api/" />
+ <link href="/usr/share/doc/libgnumail-java/api/" />
+ <link href="/usr/share/doc/libservlet2.5-java/api/" />
+ <sourcepath>
+ <pathelement path="${src.dir}"/>
+ </sourcepath>
+ </javadoc>
+
+ <echo>compiling ${module-name}</echo>
+ <javac srcdir="${src.dir}"
+ classpathref="classpath"
+ destdir="${build.dir}"
+ deprecation="false"
+ failonerror="true"
+ debug="true"
+ source="1.5"
+ target="1.5"
+ nowarn="true"
+ excludes="${javac.excludes}"
+ listfiles="true"/>
+
+ <echo>generating ${jar.file}</echo>
+ <property name="manifest.file" value="${rsrc.dir}/META-INF/MANIFEST.MF"/>
+ <available file="${manifest.file}" type="file" property="manifest.file.exists"/>
+ <available file="${rsrc.dir}" type="dir" property="rsrc.dir.exists"/>
+ <antcall target="generate-jar-with-given-manifest"/>
+ <antcall target="generate-jar-without-given-manifest"/>
+
+ <echo>copying ${jar.file} to ${module-libdir}</echo>
+ <copy file="${target.dir}/${jar.file}" todir="${module-libdir}"/>
+
+ <available file="${config.dir}" type="dir" property="config.dir.exists"/>
+ <antcall target="copy-to-etc"/>
+ <antcall target="tests" inheritRefs="true"/>
+ </target>
+
+ <target name="generate-jar" unless="jar.main.class">
+ <antcall target="jar-with-resources"/>
+ <antcall target="jar"/>
+ </target>
+
+ <target name="generate-jar-with-given-manifest" if="manifest.file.exists">
+ <antcall target="jar-with-given-manifest-and-resources"/>
+ <antcall target="jar-with-given-manifest"/>
+ </target>
+
+ <target name="generate-jar-without-given-manifest" unless="manifest.file.exists">
+ <antcall target="generate-jar-with-manifest"/>
+ <antcall target="generate-jar"/>
+ </target>
+
+ <target name="generate-jar-with-manifest" if="jar.main.class">
+ <antcall target="jar-with-manifest-and-resources"/>
+ <antcall target="jar-with-manifest"/>
+ </target>
+
+ <target name="jar" unless="rsrc.dir.exists">
+ <jar destfile="${target.dir}/${jar.file}">
+ <fileset dir="${build.dir}">
+ <include name="**/*"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="jar-with-resources" if="rsrc.dir.exists">
+ <jar destfile="${target.dir}/${jar.file}">
+ <fileset dir="${build.dir}">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${rsrc.dir}">
+ <include name="**/*"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="jar-with-manifest" unless="rsrc.dir.exists">
+ <jar destfile="${target.dir}/${jar.file}">
+ <fileset dir="${build.dir}">
+ <include name="**/*"/>
+ </fileset>
+ <manifest>
+ <attribute name="Main-Class" value="${jar.main.class}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <target name="jar-with-manifest-and-resources" if="rsrc.dir.exists">
+ <jar destfile="${target.dir}/${jar.file}">
+ <fileset dir="${build.dir}">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${rsrc.dir}">
+ <include name="**/*"/>
+ </fileset>
+ <manifest>
+ <attribute name="Main-Class" value="${jar.main.class}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <target name="jar-with-given-manifest" unless="rsrc.dir.exists">
+ <jar destfile="${target.dir}/${jar.file}" manifest="${manifest.file}">
+ <fileset dir="${build.dir}">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${rsrc.dir}">
+ <include name="**/*"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="jar-with-given-manifest-and-resources" if="rsrc.dir.exists">
+ <jar destfile="${target.dir}/${jar.file}" manifest="${manifest.file}">
+ <fileset dir="${build.dir}">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${rsrc.dir}">
+ <include name="**/*"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="copy-to-etc" if="config.dir.exists">
+ <echo>copying ${config.dir} to ${etc.dir} from ${module-name}</echo>
+ <copy todir="${etc.dir}">
+ <fileset dir="${config.dir}" excludes="**/*.svn"/>
+ </copy>
+ </target>
+
+ <target name="tests" if="run-tests">
+ <javac srcdir="${test.dir}"
+ classpathref="classpath"
+ deprecation="false"
+ failonerror="true"
+ debug="true"
+ source="1.5"
+ target="1.5"
+ nowarn="true"
+ listfiles="true"/>
+ <junit haltonfailure="off">
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement path="${test.dir}"/>
+ </classpath>
+ <formatter type="plain" usefile="false"/>
+ <batchtest>
+ <fileset dir="${test.dir}">
+ <include name="**/*Test.java"/>
+ <include name="**/*TestCase.java"/>
+ <exclude name="org/mortbay/jetty/servlet/AbstractSessionTest.java"/>
+ <exclude name="org/mortbay/jetty/AsyncStressTest.java"/>
+ <exclude name="org/mortbay/resource/*.java"/>
+ <exclude name="org/mortbay/xml/XmlConfigurationTest.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+</project>
+
Deleted: tags/jetty/6.1.24-5/debian/rules
===================================================================
--- trunk/jetty/debian/rules 2010-06-28 21:16:25 UTC (rev 12689)
+++ tags/jetty/6.1.24-5/debian/rules 2010-06-29 19:09:22 UTC (rev 12693)
@@ -1,62 +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 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::
-
Copied: tags/jetty/6.1.24-5/debian/rules (from rev 12692, trunk/jetty/debian/rules)
===================================================================
--- tags/jetty/6.1.24-5/debian/rules (rev 0)
+++ tags/jetty/6.1.24-5/debian/rules 2010-06-29 19:09:22 UTC (rev 12693)
@@ -0,0 +1,65 @@
+#!/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
+
+clean::
+ $(RM) -r debian/.mh
+
+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