[jetty9] 47/99: Wrap and sort

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository jetty9.

commit 9485fd3f8c30300e05137afce59779c3f27dc891
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 29 15:54:57 2014 +0200

    Wrap and sort
---
 debian/control   | 47 ++++++++++++++++++++++++++++++++++-------------
 debian/copyright |  1 -
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index ccedf03..8b35f4f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,25 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends: debhelper (>= 7), cdbs (>> 0.4.5.3), default-jdk, ant-optional, maven-repo-helper,
- javahelper, maven-debian-helper, libbuild-helper-maven-plugin-java, libgnumail-java (>= 1.1.2-7),
- junit, libtomcat7-java (>= 7.0.28), default-jdk-doc, libmaven-bundle-plugin-java,
- libmockito-java, glassfish-jmac-api (>= 1:2.1.1-b31g-2), libgeronimo-jta-1.1-spec-java,
- libjstl1.1-java, libservlet3.0-java (>= 7.0.40-2), libmaven-javadoc-plugin-java
+Build-Depends: ant-optional,
+               cdbs (>> 0.4.5.3),
+               debhelper (>= 7),
+               default-jdk,
+               default-jdk-doc,
+               glassfish-jmac-api (>= 1:2.1.1-b31g-2),
+               javahelper,
+               junit,
+               libbuild-helper-maven-plugin-java,
+               libgeronimo-jta-1.1-spec-java,
+               libgnumail-java (>= 1.1.2-7),
+               libjstl1.1-java,
+               libmaven-bundle-plugin-java,
+               libmaven-javadoc-plugin-java,
+               libmockito-java,
+               libservlet3.0-java (>= 7.0.40-2),
+               libtomcat7-java (>= 7.0.28),
+               maven-debian-helper,
+               maven-repo-helper
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/jetty8.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jetty8.git
@@ -39,26 +53,33 @@ Description: Javadoc for the Jetty API
 
 Package: libjetty8-extra-java
 Architecture: all
-Depends: ${misc:Depends}, libjetty8-java (>= ${source:Version}),
- libtomcat7-java (>= 7.0.28), libasm3-java, libgnumail-java,
- libjakarta-taglibs-standard-java, libservlet3.0-java,
- libjstl1.1-java
+Depends: libasm3-java,
+         libgnumail-java,
+         libjakarta-taglibs-standard-java,
+         libjetty8-java (>= ${source:Version}),
+         libjstl1.1-java,
+         libservlet3.0-java,
+         libtomcat7-java (>= 7.0.28),
+         ${misc:Depends}
 Suggests: jetty8
 Description: Java servlet engine and webserver -- extra libraries
  Jetty is an Open Source HTTP Servlet Server written in 100% Java.
  It is designed to be light weight, high performance, embeddable,
  extensible and flexible, thus making it an ideal platform for serving
- dynamic HTTP requests from any Java application. 
+ dynamic HTTP requests from any Java application.
  The extra libraries include jetty-management, jetty-naming,
  jetty-servlet-tester, jetty-ajp, jetty-java5-threadpool,
  jetty-client, jetty-rewrite-handler, jetty-plus, jetty-annotations
 
 Package: jetty8
 Architecture: all
-Depends: ${misc:Depends}, libjetty8-java (>= ${source:Version}),
- adduser, apache2-utils, default-jre-headless | java5-runtime-headless | java6-runtime-headless
+Depends: adduser,
+         apache2-utils,
+         default-jre-headless | java5-runtime-headless | java6-runtime-headless,
+         libjetty8-java (>= ${source:Version}),
+         ${misc:Depends}
 Suggests: libjetty8-extra-java (>= ${source:Version}),
- libjetty8-java-doc (>= ${source:Version})
+          libjetty8-java-doc (>= ${source:Version})
 Description: Java servlet engine and webserver
  Jetty is an Open Source HTTP Servlet Server written in 100% Java.
  It is designed to be light weight, high performance, embeddable,
diff --git a/debian/copyright b/debian/copyright
index 5adda25..98aaad6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -482,4 +482,3 @@ License: EPL-1.0
  this Agreement will bring a legal action under this Agreement more than
  one year after the cause of action arose. Each party waives its rights to
  a jury trial in any resulting litigation.
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git