Author: twerner Date: 2011-09-08 19:10:18 +0000 (Thu, 08 Sep 2011) New Revision: 14767
Added: trunk/libservlet2.4-java/debian/patches/0003-Link-javadoc-against-system-javadoc.patch Removed: trunk/libservlet2.4-java/debian/dirs trunk/libservlet2.4-java/debian/examples trunk/libservlet2.4-java/debian/patches/javadoc-link.patch Modified: trunk/libservlet2.4-java/debian/README.Debian trunk/libservlet2.4-java/debian/changelog trunk/libservlet2.4-java/debian/patches/series trunk/libservlet2.4-java/debian/rules Log: Update README.Debian. Modified: trunk/libservlet2.4-java/debian/README.Debian =================================================================== --- trunk/libservlet2.4-java/debian/README.Debian 2011-09-08 18:52:29 UTC (rev 14766) +++ trunk/libservlet2.4-java/debian/README.Debian 2011-09-08 19:10:18 UTC (rev 14767) @@ -1,10 +1,7 @@ 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. +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. - -- Arnaud Vandyck <[email protected]>, Fri Apr 22 14:47:20 2005 + -- Torsten Werner <[email protected]> Thu, 08 Sep 2011 18:24:30 +0200 Modified: trunk/libservlet2.4-java/debian/changelog =================================================================== --- trunk/libservlet2.4-java/debian/changelog 2011-09-08 18:52:29 UTC (rev 14766) +++ trunk/libservlet2.4-java/debian/changelog 2011-09-08 19:10:18 UTC (rev 14767) @@ -1,4 +1,4 @@ -libservlet2.4-java (5.5.33-1) UNRELEASED; urgency=low +libservlet2.4-java (5.5.33-1) unstable; urgency=low * Team upload @@ -17,8 +17,9 @@ * 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 18:24:30 +0200 + -- Torsten Werner <[email protected]> Thu, 08 Sep 2011 21:09:23 +0200 libservlet2.4-java (5.0.30-12) unstable; urgency=low Deleted: trunk/libservlet2.4-java/debian/dirs =================================================================== --- trunk/libservlet2.4-java/debian/dirs 2011-09-08 18:52:29 UTC (rev 14766) +++ trunk/libservlet2.4-java/debian/dirs 2011-09-08 19:10:18 UTC (rev 14767) @@ -1 +0,0 @@ -usr/share/java Deleted: trunk/libservlet2.4-java/debian/examples =================================================================== Copied: trunk/libservlet2.4-java/debian/patches/0003-Link-javadoc-against-system-javadoc.patch (from rev 14765, trunk/libservlet2.4-java/debian/patches/javadoc-link.patch) =================================================================== --- trunk/libservlet2.4-java/debian/patches/0003-Link-javadoc-against-system-javadoc.patch (rev 0) +++ trunk/libservlet2.4-java/debian/patches/0003-Link-javadoc-against-system-javadoc.patch 2011-09-08 19:10:18 UTC (rev 14767) @@ -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: trunk/libservlet2.4-java/debian/patches/javadoc-link.patch =================================================================== --- trunk/libservlet2.4-java/debian/patches/javadoc-link.patch 2011-09-08 18:52:29 UTC (rev 14766) +++ trunk/libservlet2.4-java/debian/patches/javadoc-link.patch 2011-09-08 19:10:18 UTC (rev 14767) @@ -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> - Modified: trunk/libservlet2.4-java/debian/patches/series =================================================================== --- trunk/libservlet2.4-java/debian/patches/series 2011-09-08 18:52:29 UTC (rev 14766) +++ trunk/libservlet2.4-java/debian/patches/series 2011-09-08 19:10:18 UTC (rev 14767) @@ -1,2 +1,3 @@ 0001-add-OSGi-to-jsp-api.patch 0002-add-OSGi-to-servlet-api.patch +0003-Link-javadoc-against-system-javadoc.patch Modified: trunk/libservlet2.4-java/debian/rules =================================================================== --- trunk/libservlet2.4-java/debian/rules 2011-09-08 18:52:29 UTC (rev 14766) +++ trunk/libservlet2.4-java/debian/rules 2011-09-08 19:10:18 UTC (rev 14767) @@ -19,7 +19,7 @@ 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 + 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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
