← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/tomcat6/oneiric

« back to all changes in this revision

Viewing changes to debian/control

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-07-20 14:36:48 UTC
  • mfrom: (2.2.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100720143648-23y81x6cq1kv1z00
Tags: 6.0.28-2
* Add debconf questions for user, group and Java options.
* Use ucf to install /etc/default/tomcat6 from a template
* Drop CATALINA_BASE and CATALINA_HOME from /etc/default/tomcat6 since we
  shouldn't encourage users to change those anyway

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/control
25
25
 
26
26
Package: tomcat6
27
27
Architecture: all
28
 
Depends: tomcat6-common (>= ${source:Version}),
 
28
Depends: tomcat6-common (>= ${source:Version}), ucf,
29
29
        adduser, ${misc:Depends}
30
30
Recommends: authbind
31
31
Suggests: tomcat6-docs (>= ${source:Version}),
62
62
 
63
63
Package: libtomcat6-java
64
64
Architecture: all
65
 
Depends: default-jre-headless | java6-runtime-headless,
66
 
        libecj-java,
67
 
        libcommons-dbcp-java,
68
 
        libcommons-pool-java,
69
 
        libservlet2.5-java (>= ${source:Version}), ${misc:Depends}
 
65
Depends: libecj-java,
 
66
         libcommons-dbcp-java,
 
67
         libcommons-pool-java,
 
68
         libservlet2.5-java (>= ${source:Version}), ${misc:Depends}
70
69
Suggests: tomcat6 (>= ${source:Version})
71
70
Conflicts: tomcat6-common (<< 6.0.20-5)
72
71
Description: Servlet and JSP engine -- core libraries
79
78
 
80
79
Package: libservlet2.5-java
81
80
Architecture: all
82
 
Depends: default-jre-headless | java2-runtime-headless |
83
 
         java5-runtime-headless | java6-runtime-headless, ${misc:Depends}
 
81
Depends: ${misc:Depends}
84
82
Description: Servlet 2.5 and JSP 2.1 Java API classes
85
83
 Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
86
84
 specifications from Sun Microsystems, and provides a "pure Java" HTTP web