[tomcat8] 03/05: Wrap and sort
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Dec 1 08:29:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit 0d5a50b2f53d49910a6073221ede6aa5dd369a34
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Nov 27 15:21:06 2017 +0100
Wrap and sort
---
debian/control | 92 ++++++++++++++++++++++++++-------------------
debian/tomcat8-common.links | 4 +-
2 files changed, 56 insertions(+), 40 deletions(-)
diff --git a/debian/control b/debian/control
index 8f380f4..ef33df3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,26 +2,28 @@ Source: tomcat8
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: James Page <james.page at ubuntu.com>,
- tony mancill <tmancill at debian.org>,
- Jakub Adam <jakub.adam at ktknet.cz>,
- Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant-optional,
- debhelper (>= 10),
- default-jdk,
- po-debconf
-Build-Depends-Indep: javahelper,
- junit4 (>= 4.11),
- libcglib-nodep-java,
- libeasymock-java (>= 3.0),
- libecj-java (>= 3.11.0),
- libhamcrest-java (>= 1.3),
- libtaglibs-standard-spec-java,
- libtaglibs-standard-impl-java,
- libtcnative-1,
- libobjenesis-java,
- lsb-release,
- maven-repo-helper
+Uploaders:
+ James Page <james.page at ubuntu.com>,
+ tony mancill <tmancill at debian.org>,
+ Jakub Adam <jakub.adam at ktknet.cz>,
+ Emmanuel Bourg <ebourg at apache.org>
+Build-Depends:
+ ant-optional,
+ debhelper (>= 10),
+ default-jdk,
+ javahelper,
+ junit4 (>= 4.11),
+ libcglib-nodep-java,
+ libeasymock-java (>= 3.0),
+ libecj-java (>= 3.11.0),
+ libhamcrest-java (>= 1.3),
+ libobjenesis-java,
+ libtaglibs-standard-impl-java,
+ libtaglibs-standard-spec-java,
+ libtcnative-1,
+ lsb-release,
+ maven-repo-helper,
+ po-debconf
Standards-Version: 4.1.1
Vcs-Git: https://anonscm.debian.org/git/pkg-java/tomcat8.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/tomcat8.git
@@ -29,9 +31,10 @@ Homepage: http://tomcat.apache.org
Package: tomcat8-common
Architecture: all
-Depends: default-jre-headless | java8-runtime-headless | java8-runtime,
- libtomcat8-java (>= ${source:Version}),
- ${misc:Depends}
+Depends:
+ default-jre-headless | java8-runtime-headless | java8-runtime,
+ libtomcat8-java (>= ${source:Version}),
+ ${misc:Depends}
Description: Apache Tomcat 8 - Servlet and JSP engine -- common files
Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
specifications from Oracle, and provides a "pure Java" HTTP web
@@ -42,12 +45,20 @@ Description: Apache Tomcat 8 - Servlet and JSP engine -- common files
Package: tomcat8
Architecture: all
-Depends: adduser, lsb-base (>= 3.0-6), tomcat8-common (>= ${source:Version}), ucf, ${misc:Depends}
-Recommends: authbind, libtcnative-1 (>= 1.2.6~)
-Suggests: tomcat8-admin (>= ${source:Version}),
- tomcat8-docs (>= ${source:Version}),
- tomcat8-examples (>= ${source:Version}),
- tomcat8-user (>= ${source:Version})
+Depends:
+ adduser,
+ lsb-base (>= 3.0-6),
+ tomcat8-common (>= ${source:Version}),
+ ucf,
+ ${misc:Depends}
+Recommends:
+ authbind,
+ libtcnative-1 (>= 1.2.6~)
+Suggests:
+ tomcat8-admin (>= ${source:Version}),
+ tomcat8-docs (>= ${source:Version}),
+ tomcat8-examples (>= ${source:Version}),
+ tomcat8-user (>= ${source:Version})
Description: Apache Tomcat 8 - Servlet and JSP engine
Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
specifications from Oracle, and provides a "pure Java" HTTP web
@@ -62,11 +73,15 @@ Description: Apache Tomcat 8 - Servlet and JSP engine
Package: tomcat8-user
Architecture: all
-Depends: netcat, tomcat8-common (>= ${source:Version}), ${misc:Depends}
-Suggests: tomcat8 (>= ${source:Version}),
- tomcat8-admin (>= ${source:Version}),
- tomcat8-docs (>= ${source:Version}),
- tomcat8-examples (>= ${source:Version})
+Depends:
+ netcat,
+ tomcat8-common (>= ${source:Version}),
+ ${misc:Depends}
+Suggests:
+ tomcat8 (>= ${source:Version}),
+ tomcat8-admin (>= ${source:Version}),
+ tomcat8-docs (>= ${source:Version}),
+ tomcat8-examples (>= ${source:Version})
Description: Apache Tomcat 8 - Servlet and JSP engine -- tools to create user instances
Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
specifications from Oracle, and provides a "pure Java" HTTP web
@@ -134,10 +149,11 @@ Description: Apache Tomcat 8 - Servlet and JSP engine -- admin web applications
Package: tomcat8-examples
Architecture: all
-Depends: libtaglibs-standard-spec-java,
- libtaglibs-standard-impl-java,
- tomcat8-common (>= ${source:Version}),
- ${misc:Depends}
+Depends:
+ libtaglibs-standard-impl-java,
+ libtaglibs-standard-spec-java,
+ tomcat8-common (>= ${source:Version}),
+ ${misc:Depends}
Description: Apache Tomcat 8 - Servlet and JSP engine -- example web applications
Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
specifications from Oracle, and provides a "pure Java" HTTP web
diff --git a/debian/tomcat8-common.links b/debian/tomcat8-common.links
index 2ba2b74..3f7f064 100644
--- a/debian/tomcat8-common.links
+++ b/debian/tomcat8-common.links
@@ -1,4 +1,3 @@
-/usr/share/java/tomcat8-juli.jar /usr/share/tomcat8/bin/tomcat-juli.jar
/usr/share/java/commons-dbcp.jar /usr/share/tomcat8/lib/commons-dbcp.jar
/usr/share/java/commons-pool.jar /usr/share/tomcat8/lib/commons-pool.jar
/usr/share/java/tomcat8-annotations-api.jar /usr/share/tomcat8/lib/annotations-api.jar
@@ -7,7 +6,6 @@
/usr/share/java/tomcat8-catalina-ant.jar /usr/share/tomcat8/lib/catalina-ant.jar
/usr/share/java/tomcat8-catalina-ha.jar /usr/share/tomcat8/lib/catalina-ha.jar
/usr/share/java/tomcat8-catalina-jmx-remote.jar /usr/share/tomcat8/lib/catalina-jmx-remote.jar
-/usr/share/java/tomcat8-storeconfig.jar /usr/share/tomcat8/lib/catalina-storeconfig.jar
/usr/share/java/tomcat8-coyote.jar /usr/share/tomcat8/lib/tomcat-coyote.jar
/usr/share/java/tomcat8-dbcp.jar /usr/share/tomcat8/lib/tomcat-dbcp.jar
/usr/share/java/tomcat8-el-api.jar /usr/share/tomcat8/lib/el-api.jar
@@ -20,7 +18,9 @@
/usr/share/java/tomcat8-jdbc.jar /usr/share/tomcat8/lib/tomcat-jdbc.jar
/usr/share/java/tomcat8-jni.jar /usr/share/tomcat8/lib/tomcat-jni.jar
/usr/share/java/tomcat8-jsp-api.jar /usr/share/tomcat8/lib/jsp-api.jar
+/usr/share/java/tomcat8-juli.jar /usr/share/tomcat8/bin/tomcat-juli.jar
/usr/share/java/tomcat8-servlet-api.jar /usr/share/tomcat8/lib/servlet-api.jar
+/usr/share/java/tomcat8-storeconfig.jar /usr/share/tomcat8/lib/catalina-storeconfig.jar
/usr/share/java/tomcat8-tribes.jar /usr/share/tomcat8/lib/catalina-tribes.jar
/usr/share/java/tomcat8-util.jar /usr/share/tomcat8/lib/tomcat-util.jar
/usr/share/java/tomcat8-util-scan.jar /usr/share/tomcat8/lib/tomcat-util-scan.jar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git
More information about the pkg-java-commits
mailing list