Author: twerner Date: 2011-09-08 19:12:27 +0000 (Thu, 08 Sep 2011) New Revision: 14768
Added: tags/libservlet2.4-java/5.5.33-1/ tags/libservlet2.4-java/5.5.33-1/debian/README.Debian tags/libservlet2.4-java/5.5.33-1/debian/changelog tags/libservlet2.4-java/5.5.33-1/debian/patches/0003-Link-javadoc-against-system-javadoc.patch tags/libservlet2.4-java/5.5.33-1/debian/patches/series tags/libservlet2.4-java/5.5.33-1/debian/rules Removed: tags/libservlet2.4-java/5.5.33-1/debian/README.Debian tags/libservlet2.4-java/5.5.33-1/debian/changelog tags/libservlet2.4-java/5.5.33-1/debian/dirs tags/libservlet2.4-java/5.5.33-1/debian/examples tags/libservlet2.4-java/5.5.33-1/debian/patches/javadoc-link.patch tags/libservlet2.4-java/5.5.33-1/debian/patches/series tags/libservlet2.4-java/5.5.33-1/debian/rules Log: [svn-buildpackage] Tagging libservlet2.4-java 5.5.33-1 Deleted: tags/libservlet2.4-java/5.5.33-1/debian/README.Debian =================================================================== --- trunk/libservlet2.4-java/debian/README.Debian 2011-09-08 16:29:11 UTC (rev 14765) +++ tags/libservlet2.4-java/5.5.33-1/debian/README.Debian 2011-09-08 19:12:27 UTC (rev 14768) @@ -1,10 +0,0 @@ -libservlet2.4-java for Debian ------------------------------ - -The sources of jsr152 (JSP 2.0) and jsr154 (Servlet API 2.4) come from -Tomcat5. They have been extracted form tomcat5 source package because -libcommons-el-java package needs this API to build and tomcat5 needs -libcommons-el-java (and libservlet2.4-java) to build, so it's easier to -split the source packages. - - -- Arnaud Vandyck <[email protected]>, Fri Apr 22 14:47:20 2005 Copied: tags/libservlet2.4-java/5.5.33-1/debian/README.Debian (from rev 14767, trunk/libservlet2.4-java/debian/README.Debian) =================================================================== --- tags/libservlet2.4-java/5.5.33-1/debian/README.Debian (rev 0) +++ tags/libservlet2.4-java/5.5.33-1/debian/README.Debian 2011-09-08 19:12:27 UTC (rev 14768) @@ -0,0 +1,7 @@ +libservlet2.4-java for Debian +----------------------------- + +The sources of jsr152 (JSP 2.0) and jsr154 (Servlet API 2.4) come from Tomcat +5.5. The package is needed as a (Build-)Depends by other packages. + + -- Torsten Werner <[email protected]> Thu, 08 Sep 2011 18:24:30 +0200 Deleted: tags/libservlet2.4-java/5.5.33-1/debian/changelog =================================================================== --- trunk/libservlet2.4-java/debian/changelog 2011-09-08 16:29:11 UTC (rev 14765) +++ tags/libservlet2.4-java/5.5.33-1/debian/changelog 2011-09-08 19:12:27 UTC (rev 14768) @@ -1,132 +0,0 @@ -libservlet2.4-java (5.5.33-1) UNRELEASED; urgency=low - - * Team upload - - [ Niels Thykier ] - * Replaced B-D on default-jdk-builddep with default-jdk and - gcj-native-helper. - * Removed Depends on JREs for library packages - no longer required. - * Bumped Standards-Versions to 3.9.0 - no changes required. - * Removed Arnaud Vandyck from uploaders - thanks for your work on - this package in the past. - * Link javadoc to system javadocs. - - [ Torsten Werner ] - * New upstream release. - * Update debian/watch to point to svn tree and implement download through - debian/orig-tar.sh. - * Refresh patches. - * Drop libservlet2.4-java-gcj package. - * Change Build-Depends: ant1.7 to ant. - * Drop unversioned symlink /usr/share/java/jsp.jar. (Closes: #576658) - - -- Torsten Werner <[email protected]> Thu, 08 Sep 2011 18:24:30 +0200 - -libservlet2.4-java (5.0.30-12) unstable; urgency=low - - * Change Build-Depends: ant1.7 because gij fails with bus error when - executing ant 1.8. - - -- Torsten Werner <[email protected]> Sat, 27 Feb 2010 19:07:08 +0100 - -libservlet2.4-java (5.0.30-11) unstable; urgency=low - - * Added Maven support - * Standards-Version to 3.8.4 - - -- Gabriele Giacone <[email protected]> Thu, 18 Feb 2010 23:03:26 +0100 - -libservlet2.4-java (5.0.30-10) unstable; urgency=low - - * Corrected the placement of the OSGi metadata in the manifest. - - -- Niels Thykier <[email protected]> Thu, 10 Dec 2009 11:02:03 +0100 - -libservlet2.4-java (5.0.30-9) unstable; urgency=low - - [ Matthias Klose ] - * Depend on default-jre-headless. - * Merge from Ubuntu: - - Move examples and documentation into a new libservlet2.4-java-doc package. - * Set java source version to 1.4. - - [ Niels Thykier ] - * Added myself to uploaders. - * Bumped Standards-Version to 3.8.3. - - Changed section to java. - - Refered to the Apache-2.0 license rather than quoting it. - - Added Homepage and Vcs-* fields. - * Added more alternatives for java in Depends. - * Added missing ${misc:Depends}. - * Bumped debhelper compat to 7. - * Imported the description from tomcat6; it was vastly better than - the previous. - * Added a clause clarifying that the "doc" package only contains - the java API. - * Removed unused parts of the rules file. - * Added OSGi metadata to the manifests. - * Converted to source format to 3.0 (quilt). - - Updated existing patch to apply correctly when using quilt. - * Added short description to existing patch. - - -- Niels Thykier <[email protected]> Thu, 26 Nov 2009 09:29:10 +0100 - -libservlet2.4-java (5.0.30-8) unstable; urgency=low - - * Build-Depend on default-jdk-builddep. Closes: #477888 - - -- Michael Koch <[email protected]> Sun, 27 Apr 2008 12:08:12 -0100 - -libservlet2.4-java (5.0.30-7) unstable; urgency=low - - * Updated watch file to mach for tomcat5.5 instead of tomcat5. - Closes: #449625. - * Cleared up copyright in debian/copyright. - * Updated Standards-Version to 3.7.3. - - -- Michael Koch <[email protected]> Tue, 19 Feb 2008 23:14:46 +0100 - -libservlet2.4-java (5.0.30-6) unstable; urgency=low - - * Fix XSS bug (CVE-2007-4724) in cal2.jsp. - - -- Michael Koch <[email protected]> Sat, 06 Oct 2007 23:50:14 +0200 - -libservlet2.4-java (5.0.30-5) unstable; urgency=low - - * Build a libservlet2.4-java-gcj package. - - -- Matthias Klose <[email protected]> Tue, 26 Jun 2007 09:33:22 +0200 - -libservlet2.4-java (5.0.30-4) unstable; urgency=low - - * Use java-gcj-compat instead of kaffe. - * Moved Build-Depends-Indep to Build-Depends. - * Removed Wolfgang and added myself to Uploaders. - * Updated Standards-Version. - - -- Michael Koch <[email protected]> Sun, 17 Jun 2007 20:13:28 +0200 - -libservlet2.4-java (5.0.30-3) unstable; urgency=low - - * kaffe compiler transition - * Bumped debhelper version to fix linda error - * Standards-Version 3.6.2 (no changes) - * Depend on kaffe | java1-runtime | java2-runtime as this is - currently still policy (closes: #345338) - * Added myself to uploaders - - -- Wolfgang Baer <[email protected]> Sun, 15 Jan 2006 16:28:08 +0100 - -libservlet2.4-java (5.0.30-2) unstable; urgency=low - - * changed the libant1.6-java to ant dependency - - -- Arnaud Vandyck <[email protected]> Sat, 20 Aug 2005 11:00:00 +0200 - -libservlet2.4-java (5.0.30-1) unstable; urgency=low - - * Initial Release (closes: #305847). - - -- Arnaud Vandyck <[email protected]> Sat, 23 Apr 2005 12:28:36 +0200 - Copied: tags/libservlet2.4-java/5.5.33-1/debian/changelog (from rev 14767, trunk/libservlet2.4-java/debian/changelog) =================================================================== --- tags/libservlet2.4-java/5.5.33-1/debian/changelog (rev 0) +++ tags/libservlet2.4-java/5.5.33-1/debian/changelog 2011-09-08 19:12:27 UTC (rev 14768) @@ -0,0 +1,131 @@ +libservlet2.4-java (5.5.33-1) unstable; urgency=low + + * Team upload + + [ Niels Thykier ] + * Removed Depends on JREs for library packages - no longer required. + * Bumped Standards-Versions to 3.9.0 - no changes required. + * Removed Arnaud Vandyck from uploaders - thanks for your work on + this package in the past. + * Link javadoc to system javadocs. + + [ Torsten Werner ] + * New upstream release. + * Update debian/watch to point to svn tree and implement download through + debian/orig-tar.sh. + * Refresh patches. + * Drop libservlet2.4-java-gcj package. + * Change Build-Depends: ant1.7 to ant. + * Drop unversioned symlink /usr/share/java/jsp.jar. (Closes: #576658) + * Update README.Debian. + + -- Torsten Werner <[email protected]> Thu, 08 Sep 2011 21:09:23 +0200 + +libservlet2.4-java (5.0.30-12) unstable; urgency=low + + * Change Build-Depends: ant1.7 because gij fails with bus error when + executing ant 1.8. + + -- Torsten Werner <[email protected]> Sat, 27 Feb 2010 19:07:08 +0100 + +libservlet2.4-java (5.0.30-11) unstable; urgency=low + + * Added Maven support + * Standards-Version to 3.8.4 + + -- Gabriele Giacone <[email protected]> Thu, 18 Feb 2010 23:03:26 +0100 + +libservlet2.4-java (5.0.30-10) unstable; urgency=low + + * Corrected the placement of the OSGi metadata in the manifest. + + -- Niels Thykier <[email protected]> Thu, 10 Dec 2009 11:02:03 +0100 + +libservlet2.4-java (5.0.30-9) unstable; urgency=low + + [ Matthias Klose ] + * Depend on default-jre-headless. + * Merge from Ubuntu: + - Move examples and documentation into a new libservlet2.4-java-doc package. + * Set java source version to 1.4. + + [ Niels Thykier ] + * Added myself to uploaders. + * Bumped Standards-Version to 3.8.3. + - Changed section to java. + - Refered to the Apache-2.0 license rather than quoting it. + - Added Homepage and Vcs-* fields. + * Added more alternatives for java in Depends. + * Added missing ${misc:Depends}. + * Bumped debhelper compat to 7. + * Imported the description from tomcat6; it was vastly better than + the previous. + * Added a clause clarifying that the "doc" package only contains + the java API. + * Removed unused parts of the rules file. + * Added OSGi metadata to the manifests. + * Converted to source format to 3.0 (quilt). + - Updated existing patch to apply correctly when using quilt. + * Added short description to existing patch. + + -- Niels Thykier <[email protected]> Thu, 26 Nov 2009 09:29:10 +0100 + +libservlet2.4-java (5.0.30-8) unstable; urgency=low + + * Build-Depend on default-jdk-builddep. Closes: #477888 + + -- Michael Koch <[email protected]> Sun, 27 Apr 2008 12:08:12 -0100 + +libservlet2.4-java (5.0.30-7) unstable; urgency=low + + * Updated watch file to mach for tomcat5.5 instead of tomcat5. + Closes: #449625. + * Cleared up copyright in debian/copyright. + * Updated Standards-Version to 3.7.3. + + -- Michael Koch <[email protected]> Tue, 19 Feb 2008 23:14:46 +0100 + +libservlet2.4-java (5.0.30-6) unstable; urgency=low + + * Fix XSS bug (CVE-2007-4724) in cal2.jsp. + + -- Michael Koch <[email protected]> Sat, 06 Oct 2007 23:50:14 +0200 + +libservlet2.4-java (5.0.30-5) unstable; urgency=low + + * Build a libservlet2.4-java-gcj package. + + -- Matthias Klose <[email protected]> Tue, 26 Jun 2007 09:33:22 +0200 + +libservlet2.4-java (5.0.30-4) unstable; urgency=low + + * Use java-gcj-compat instead of kaffe. + * Moved Build-Depends-Indep to Build-Depends. + * Removed Wolfgang and added myself to Uploaders. + * Updated Standards-Version. + + -- Michael Koch <[email protected]> Sun, 17 Jun 2007 20:13:28 +0200 + +libservlet2.4-java (5.0.30-3) unstable; urgency=low + + * kaffe compiler transition + * Bumped debhelper version to fix linda error + * Standards-Version 3.6.2 (no changes) + * Depend on kaffe | java1-runtime | java2-runtime as this is + currently still policy (closes: #345338) + * Added myself to uploaders + + -- Wolfgang Baer <[email protected]> Sun, 15 Jan 2006 16:28:08 +0100 + +libservlet2.4-java (5.0.30-2) unstable; urgency=low + + * changed the libant1.6-java to ant dependency + + -- Arnaud Vandyck <[email protected]> Sat, 20 Aug 2005 11:00:00 +0200 + +libservlet2.4-java (5.0.30-1) unstable; urgency=low + + * Initial Release (closes: #305847). + + -- Arnaud Vandyck <[email protected]> Sat, 23 Apr 2005 12:28:36 +0200 + Deleted: tags/libservlet2.4-java/5.5.33-1/debian/dirs =================================================================== --- trunk/libservlet2.4-java/debian/dirs 2011-09-08 16:29:11 UTC (rev 14765) +++ tags/libservlet2.4-java/5.5.33-1/debian/dirs 2011-09-08 19:12:27 UTC (rev 14768) @@ -1 +0,0 @@ -usr/share/java Deleted: tags/libservlet2.4-java/5.5.33-1/debian/examples =================================================================== Copied: tags/libservlet2.4-java/5.5.33-1/debian/patches/0003-Link-javadoc-against-system-javadoc.patch (from rev 14767, trunk/libservlet2.4-java/debian/patches/0003-Link-javadoc-against-system-javadoc.patch) =================================================================== --- tags/libservlet2.4-java/5.5.33-1/debian/patches/0003-Link-javadoc-against-system-javadoc.patch (rev 0) +++ tags/libservlet2.4-java/5.5.33-1/debian/patches/0003-Link-javadoc-against-system-javadoc.patch 2011-09-08 19:12:27 UTC (rev 14768) @@ -0,0 +1,40 @@ +From: Niels Thykier <[email protected]> +Date: Thu, 8 Sep 2011 21:07:35 +0200 +Subject: Link javadoc against system javadoc + +--- + jsr152/build.xml | 4 +++- + jsr154/build.xml | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/jsr152/build.xml b/jsr152/build.xml +index 84cbab9..0a77c92 100644 +--- a/jsr152/build.xml ++++ b/jsr152/build.xml +@@ -121,7 +121,9 @@ + use="true" + windowtitle="JavaServer Pages API Documentation" + doctitle="JavaServer Pages API Documentation" +- bottom="Copyright &copy; 1999-2011 The Apache Software Foundation. All Rights Reserved."/> ++ bottom="Copyright &copy; 1999-2011 The Apache Software Foundation. All Rights Reserved."> ++ <link href="/usr/share/doc/default-jdk-doc/api" /> ++ </javadoc> + + </target> + +diff --git a/jsr154/build.xml b/jsr154/build.xml +index 6b66835..26d4bf1 100644 +--- a/jsr154/build.xml ++++ b/jsr154/build.xml +@@ -111,7 +111,9 @@ + use="true" + windowtitle="Servlet API Documentation" + doctitle="Servlet API Documentation" +- bottom="Copyright &copy; 1999-2011 The Apache Software Foundation. All Rights Reserved."/> ++ bottom="Copyright &copy; 1999-2011 The Apache Software Foundation. All Rights Reserved."> ++ <link href="/usr/share/doc/default-jdk-doc/api" /> ++ </javadoc> + + </target> + +-- Deleted: tags/libservlet2.4-java/5.5.33-1/debian/patches/javadoc-link.patch =================================================================== --- trunk/libservlet2.4-java/debian/patches/javadoc-link.patch 2011-09-08 16:29:11 UTC (rev 14765) +++ tags/libservlet2.4-java/5.5.33-1/debian/patches/javadoc-link.patch 2011-09-08 19:12:27 UTC (rev 14768) @@ -1,29 +0,0 @@ -Description: Link javadoc against system javadoc -Author: Niels Thykier <[email protected]> - ---- a/jsr152/build.xml 2010-07-07 17:56:40.368937457 +0200 -+++ b/jsr152/build.xml 2010-07-07 17:57:09.252942815 +0200 -@@ -102,7 +102,9 @@ - use="true" - windowtitle="JavaServer Pages API Documentation" - doctitle="JavaServer Pages API Documentation" -- bottom="Copyright &copy; 1999-2002 The Apache Software Foundation. All Rights Reserved."/> -+ bottom="Copyright &copy; 1999-2002 The Apache Software Foundation. All Rights Reserved."> -+ <link href="/usr/share/doc/default-jdk-doc/api" /> -+ </javadoc> - - </target> - ---- a/jsr154/build.xml 2010-07-07 17:57:45.896951882 +0200 -+++ b/jsr154/build.xml 2010-07-07 17:58:29.860935203 +0200 -@@ -93,7 +93,9 @@ - use="true" - windowtitle="Servlet API Documentation" - doctitle="Servlet API Documentation" -- bottom="Copyright &copy; 1999-2002 The Apache Software Foundation. All Rights Reserved."/> -+ bottom="Copyright &copy; 1999-2002 The Apache Software Foundation. All Rights Reserved."> -+ <link href="/usr/share/doc/default-jdk-doc/api" /> -+ </javadoc> - - </target> - Deleted: tags/libservlet2.4-java/5.5.33-1/debian/patches/series =================================================================== --- trunk/libservlet2.4-java/debian/patches/series 2011-09-08 16:29:11 UTC (rev 14765) +++ tags/libservlet2.4-java/5.5.33-1/debian/patches/series 2011-09-08 19:12:27 UTC (rev 14768) @@ -1,2 +0,0 @@ -0001-add-OSGi-to-jsp-api.patch -0002-add-OSGi-to-servlet-api.patch Copied: tags/libservlet2.4-java/5.5.33-1/debian/patches/series (from rev 14767, trunk/libservlet2.4-java/debian/patches/series) =================================================================== --- tags/libservlet2.4-java/5.5.33-1/debian/patches/series (rev 0) +++ tags/libservlet2.4-java/5.5.33-1/debian/patches/series 2011-09-08 19:12:27 UTC (rev 14768) @@ -0,0 +1,3 @@ +0001-add-OSGi-to-jsp-api.patch +0002-add-OSGi-to-servlet-api.patch +0003-Link-javadoc-against-system-javadoc.patch Deleted: tags/libservlet2.4-java/5.5.33-1/debian/rules =================================================================== --- trunk/libservlet2.4-java/debian/rules 2011-09-08 16:29:11 UTC (rev 14765) +++ tags/libservlet2.4-java/5.5.33-1/debian/rules 2011-09-08 19:12:27 UTC (rev 14768) @@ -1,35 +0,0 @@ -#!/usr/bin/make -f -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2005 Arnaud Vandyck <[email protected]> -# based on the work of Stefan Gybas: -# Copyright © 2003 Stefan Gybas <[email protected]> - -# -# Build servlet 2.4 and JSP 2.0 -# - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILDFILE := debian/build.xml -ANT_OPTS = -Dant.build.javac.source=1.4 - -LIBRARY_PACKAGE := servlet -API_VERSION := 2.4 - -install/libservlet2.4-java:: - install -m 644 tmp/dist-jsp/lib/jsp-api.jar debian/$(cdbs_curpkg)/usr/share/java/jsp-api-2.0.jar - mh_installpom -plibservlet2.4-java $(CURDIR)/debian/pom.xml - mh_installjar -plibservlet2.4-java -l $(CURDIR)/debian/pom.xml \ - tmp/dist-servlet-api/lib/servlet-api.jar - -install/libservlet2.4-java-doc:: - mv tmp/dist-jsp/docs/api tmp/dist-jsp/docs/api-jsp - mv tmp/dist-servlet-api/docs/api tmp/dist-servlet-api/docs/api-servlet - mv tmp/dist-jsp/examples/examples.war tmp/dist-jsp/examples/examples-jsp.war - mv tmp/dist-servlet-api/examples/examples.war tmp/dist-servlet-api/examples/examples-servlet.war - -get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download - Copied: tags/libservlet2.4-java/5.5.33-1/debian/rules (from rev 14767, trunk/libservlet2.4-java/debian/rules) =================================================================== --- tags/libservlet2.4-java/5.5.33-1/debian/rules (rev 0) +++ tags/libservlet2.4-java/5.5.33-1/debian/rules 2011-09-08 19:12:27 UTC (rev 14768) @@ -0,0 +1,35 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2005 Arnaud Vandyck <[email protected]> +# based on the work of Stefan Gybas: +# Copyright © 2003 Stefan Gybas <[email protected]> + +# +# Build servlet 2.4 and JSP 2.0 +# + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk + +JAVA_HOME := /usr/lib/jvm/default-java +DEB_ANT_BUILDFILE := debian/build.xml +ANT_OPTS = -Dant.build.javac.source=1.4 + +LIBRARY_PACKAGE := servlet +API_VERSION := 2.4 + +install/libservlet2.4-java:: + install -m 644 -D tmp/dist-jsp/lib/jsp-api.jar debian/$(cdbs_curpkg)/usr/share/java/jsp-api-2.0.jar + mh_installpom -plibservlet2.4-java $(CURDIR)/debian/pom.xml + mh_installjar -plibservlet2.4-java -l $(CURDIR)/debian/pom.xml \ + tmp/dist-servlet-api/lib/servlet-api.jar + +install/libservlet2.4-java-doc:: + mv tmp/dist-jsp/docs/api tmp/dist-jsp/docs/api-jsp + mv tmp/dist-servlet-api/docs/api tmp/dist-servlet-api/docs/api-servlet + mv tmp/dist-jsp/examples/examples.war tmp/dist-jsp/examples/examples-jsp.war + mv tmp/dist-servlet-api/examples/examples.war tmp/dist-servlet-api/examples/examples-servlet.war + +get-orig-source: + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download + _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
