[sitemesh] 03/07: Wrap and sort

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository sitemesh.

commit de2a4b6110d5a503b7d49ad948b1e50f43d32a5b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 29 09:11:04 2016 +0200

    Wrap and sort
---
 debian/control                      | 24 +++++++++++++++++-------
 debian/libsitemesh-java-doc.install | 10 +++++-----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index c1cf3af..864e088 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,21 @@
 Source: sitemesh
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Miguel Landaeta <miguel at miguel.cc>, Emmanuel Bourg <ebourg at apache.org>
 Section: java
 Priority: optional
-Build-Depends: debhelper (>= 9), ant, default-jdk, javahelper, jflex,
- libservlet3.1-java, velocity, libvelocity-tools-java,
- libfreemarker-java, junit, ant-optional, default-jdk-doc
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Miguel Landaeta <miguel at miguel.cc>, Emmanuel Bourg <ebourg at apache.org>
+Build-Depends:
+ ant,
+ ant-optional,
+ debhelper (>= 9),
+ default-jdk,
+ default-jdk-doc,
+ javahelper,
+ jflex,
+ junit,
+ libfreemarker-java,
+ libservlet3.1-java,
+ libvelocity-tools-java,
+ velocity
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/sitemesh.git
 Vcs-Browsers: https://anonscm.debian.org/cgit/pkg-java/sitemesh.git
@@ -14,7 +24,7 @@ Homepage: http://www.sitemesh.org
 Package: libsitemesh-java
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libfreemarker-java, velocity, libvelocity-tools-java
+Suggests: libfreemarker-java, libvelocity-tools-java, velocity
 Description: web-page layout and decoration framework
  SiteMesh is framework that aids in creating large sites consisting of
  many web pages and applications for which a consistent look/feel,
@@ -29,7 +39,7 @@ Package: libsitemesh-java-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Suggests: libsitemesh-java (= ${binary:Version}), default-jdk-doc
+Suggests: default-jdk-doc, libsitemesh-java (= ${binary:Version})
 Description: documentation for libsitemesh-java
  Documentation for SiteMesh which is a framework that aids in creating
  large sites consisting of many web pages and applications for which a
diff --git a/debian/libsitemesh-java-doc.install b/debian/libsitemesh-java-doc.install
index 4843ee9..953c6bb 100644
--- a/debian/libsitemesh-java-doc.install
+++ b/debian/libsitemesh-java-doc.install
@@ -1,11 +1,11 @@
-dist/docs/api              usr/share/doc/libsitemesh-java
 dist/docs/*.html           usr/share/doc/libsitemesh-java/html
+dist/docs/README.txt       usr/share/doc/libsitemesh-java
+dist/docs/api              usr/share/doc/libsitemesh-java
+dist/docs/cache.jsp.txt    usr/share/doc/libsitemesh-java/html
+dist/docs/dtd              usr/share/doc/libsitemesh-java/html
 dist/docs/images           usr/share/doc/libsitemesh-java/html
 dist/docs/meta.xml         usr/share/doc/libsitemesh-java/html
-dist/docs/style.jsp.txt    usr/share/doc/libsitemesh-java/html
-dist/docs/cache.jsp.txt    usr/share/doc/libsitemesh-java/html
 dist/docs/navpanel.jsp     usr/share/doc/libsitemesh-java/html
-dist/docs/dtd              usr/share/doc/libsitemesh-java/html
+dist/docs/style.jsp.txt    usr/share/doc/libsitemesh-java/html
 dist/sitemesh-blank.war    usr/share/doc/libsitemesh-java/examples
 dist/sitemesh-example.war  usr/share/doc/libsitemesh-java/examples
-dist/docs/README.txt       usr/share/doc/libsitemesh-java

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