diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2011-12-24 18:25:38 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2011-12-24 18:25:38 +0000 |
| commit | 4c3ce5e676012c6d2bb3faaf448f6846b9a32ffa (patch) | |
| tree | 7a4badc523dc911c816dde0b0a87f32ac178db25 /www-servers | |
| parent | Version bump (diff) | |
| download | gentoo-2-4c3ce5e676012c6d2bb3faaf448f6846b9a32ffa.tar.gz gentoo-2-4c3ce5e676012c6d2bb3faaf448f6846b9a32ffa.tar.bz2 gentoo-2-4c3ce5e676012c6d2bb3faaf448f6846b9a32ffa.zip | |
www-servers/tomcat: fixed documentation issues
(Portage version: 2.1.10.43/cvs/Linux x86_64)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 10 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-7.0.23-r2.ebuild (renamed from www-servers/tomcat/tomcat-7.0.23-r1.ebuild) | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index e796ab0a1305..60156da221f3 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.271 2011/12/15 21:31:15 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.272 2011/12/24 18:25:38 fordfrog Exp $ + +*tomcat-7.0.23-r2 (24 Dec 2011) + + 24 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org> -tomcat-7.0.23-r1.ebuild, + +tomcat-7.0.23-r2.ebuild: + Fixed installation of documentation (bug #393511, thanks to ron widler + <ron@einfach.org> for the fix). Also added symlink to docs to catalina base + webapps which fixes display of documentation from Tomcat default web app. *tomcat-7.0.23-r1 (15 Dec 2011) diff --git a/www-servers/tomcat/tomcat-7.0.23-r1.ebuild b/www-servers/tomcat/tomcat-7.0.23-r2.ebuild index d953141ff0c6..36ad554c72dd 100644 --- a/www-servers/tomcat/tomcat-7.0.23-r1.ebuild +++ b/www-servers/tomcat/tomcat-7.0.23-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.23-r1.ebuild,v 1.1 2011/12/15 21:31:15 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.23-r2.ebuild,v 1.1 2011/12/24 18:25:38 fordfrog Exp $ EAPI=2 JAVA_PKG_IUSE="doc examples source test" @@ -143,7 +143,8 @@ src_install() { cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die if use doc; then - cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die + cp -pR "${S}"/output/build/webapps/docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die + dosym /usr/share/${TOMCAT_NAME}/webapps/docs /var/lib/${TOMCAT_NAME}/webapps/docs || die fi if use examples; then cd "${S}"/webapps/examples/WEB-INF/lib |