[javatools] 03/09: 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 javatools.

commit e3945dd6636dea648355f1b650a038920076f1a5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 30 09:57:17 2017 +0200

    Wrap and sort
---
 debian/control             | 32 ++++++++++++++++++++------------
 debian/jarwrapper.install  |  2 +-
 debian/javahelper.install  | 34 +++++++++++++++++-----------------
 debian/javahelper.manpages |  6 +++---
 4 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/debian/control b/debian/control
index 5703e8a..1d14dec 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,16 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 10)
-Build-Depends-Indep: default-jdk, libarchive-zip-perl (>= 1.30-6~), markdown, perl,
-     libtest-minimumversion-perl,
-     libtest-perl-critic-perl,
-     libtest-strict-perl,
-     perl (>= 5.12) | libtest-simple-perl (>= 0.93)
+Build-Depends:
+ debhelper (>= 10),
+ default-jdk,
+ libarchive-zip-perl (>= 1.30-6~),
+ libtest-minimumversion-perl,
+ libtest-perl-critic-perl,
+ libtest-strict-perl,
+ markdown,
+ perl,
+ perl (>= 5.12) | libtest-simple-perl (>= 0.93)
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/javatools.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/javatools.git
@@ -26,12 +30,16 @@ Description: Run executable Java .jar files
 
 Package: javahelper
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, debhelper (>= 10), devscripts,
-         bsdmainutils, dpkg-dev, dctrl-tools,
-         libarchive-zip-perl (>= 1.30-6~)
-Suggests: cvs,
-          gawk,
-          tofrodos,
+Depends:
+ bsdmainutils,
+ dctrl-tools,
+ debhelper (>= 10),
+ devscripts,
+ dpkg-dev,
+ libarchive-zip-perl (>= 1.30-6~),
+ ${misc:Depends},
+ ${perl:Depends}
+Suggests: cvs, gawk, tofrodos
 Description: Helper scripts for packaging Java programs
  Javahelper contains several scripts which help in packaging
  Java programs.
diff --git a/debian/jarwrapper.install b/debian/jarwrapper.install
index 1f7f79f..db67f65 100644
--- a/debian/jarwrapper.install
+++ b/debian/jarwrapper.install
@@ -1,4 +1,4 @@
 jardetector /usr/bin
 jarwrapper /usr/bin
-java-arch.sh /usr/share/jarwrapper
 jarwrapper-binfmt/jarwrapper /usr/share/binfmts
+java-arch.sh /usr/share/jarwrapper
diff --git a/debian/javahelper.install b/debian/javahelper.install
index 3ac2d20..b2cab64 100644
--- a/debian/javahelper.install
+++ b/debian/javahelper.install
@@ -1,25 +1,25 @@
+# Internal helper command - not ready for /usr/bin
+eclipse_helper.pm /usr/share/perl5/Debian/Debhelper/Sequence
 fetch-eclipse-source /usr/bin
-jh_depends /usr/bin
-jh_manifest /usr/bin
-jh_exec /usr/bin
+java-arch.sh /usr/share/javahelper
+java-vars.mk /usr/share/javahelper
+javahelper.mk /usr/share/cdbs/1/class
+javahelper.pm /usr/share/perl5/Debian/Debhelper/Sequence
 jh_build /usr/bin
-jh_clean /usr/bin
 jh_classpath /usr/bin
-jh_installlibs /usr/bin
+jh_clean /usr/bin
+jh_compilefeatures /usr/bin
+jh_depends /usr/bin
+jh_exec /usr/bin
+jh_generateorbitdir /usr/bin
+jh_installeclipse /usr/bin
 jh_installjavadoc /usr/bin
+jh_installlibs /usr/bin
+jh_lib.sh /usr/share/javahelper
+jh_linkjars /usr/bin
 jh_makepkg /usr/bin
+jh_manifest /usr/bin
 jh_repack /usr/bin
-jh_linkjars /usr/bin
-jh_installeclipse /usr/bin
-jh_generateorbitdir /usr/bin
-jh_setupenvironment /usr/bin
-jh_compilefeatures /usr/bin
-jh_lib.sh /usr/share/javahelper
-# Internal helper command - not ready for /usr/bin
 jh_scanjavadoc /usr/share/javahelper
-java-vars.mk /usr/share/javahelper
-java-arch.sh /usr/share/javahelper
-javahelper.mk /usr/share/cdbs/1/class
-javahelper.pm /usr/share/perl5/Debian/Debhelper/Sequence
-eclipse_helper.pm /usr/share/perl5/Debian/Debhelper/Sequence
+jh_setupenvironment /usr/bin
 lib/Debian/ /usr/share/perl5/
diff --git a/debian/javahelper.manpages b/debian/javahelper.manpages
index 2724230..8527947 100644
--- a/debian/javahelper.manpages
+++ b/debian/javahelper.manpages
@@ -1,11 +1,11 @@
 jh_build.1
+jh_classpath.1
 jh_depends.1
 jh_exec.1
-jh_installlibs.1
 jh_installjavadoc.1
+jh_installlibs.1
+jh_linkjars.1
 jh_makepkg.1
-jh_classpath.1
 jh_repack.1
-jh_linkjars.1
 tmp/*.1
 tmp/*.3

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