[arch-commits] Commit in tomcat/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Saturday, August 2, 2008 @ 01:09:05
  Author: eric
Revision: 7449

fixed svn conflicts

Modified:
  tomcat/repos/extra-x86_64/	(properties)
  tomcat/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)


Property changes on: tomcat/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /tomcat/trunk:1
   + /tomcat/trunk:1-7448

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-08-02 05:00:57 UTC (rev 7448)
+++ extra-x86_64/PKGBUILD	2008-08-02 05:09:05 UTC (rev 7449)
@@ -1,13 +1,14 @@
 # $Id$
-# Maintainer: simo <simo at archlinux.org>
+# Maintainer: Hugo Doria <hugo at archlinux.org>
+
 pkgname=tomcat
 pkgver=5.5.23
-pkgrel=2
+pkgrel=3
+arch=('i686' 'x86_64')
 pkgdesc="Servlet container for Java Servlet and JavaServer Pages"
-arch=('i686' 'x86_64')
 url="http://tomcat.apache.org/"
-license=("APACHE")
-depends=('java-runtime')
+license=('Apache')
+depends=('jre')
 makedepends=('jdk')
 backup=(opt/tomcat/conf/server.xml opt/tomcat/conf/tomcat-users.xml \
         etc/conf.d/tomcat)