[javatools] 02/10: wrap-and-sort -sa

[Markus Koschany]

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

apo-guest pushed a commit to branch experimental
in repository javatools.

commit 536faf2d946f0be4f9e3e6f97f60c89a766fb9cd
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Dec 5 09:44:36 2014 +0100

    wrap-and-sort -sa
---
 debian/control            | 59 ++++++++++++++++++++++++++++++++---------------
 debian/javahelper.install | 34 +++++++++++++--------------
 2 files changed, 57 insertions(+), 36 deletions(-)

diff --git a/debian/control b/debian/control
index a84ae5e..46c9c61 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,20 @@
 Source: javatools
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Matthew Johnson <mjj29 at debian.org>, Niels Thykier <niels at thykier.net>
-Build-Depends: debhelper (>= 7.0.50~)
-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)
+Uploaders:
+ Matthew Johnson <mjj29 at debian.org>,
+ Niels Thykier <niels at thykier.net>
+Build-Depends:
+ debhelper (>= 7.0.50~)
+Build-Depends-Indep:
+ 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: 3.9.5
 Section: java
 Vcs-Git: git://anonscm.debian.org/pkg-java/javatools.git
@@ -15,7 +22,11 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/javatools.git
 
 Package: jarwrapper
 Architecture: all
-Depends: binfmt-support, fastjar, ${misc:Depends}, ${perl:Depends}
+Depends:
+ binfmt-support,
+ fastjar,
+ ${misc:Depends},
+ ${perl:Depends}
 Description: Run executable Java .jar files
  Jarwrapper sets up binfmt-misc to run executable jar files
  using the installed java runtime.
@@ -26,12 +37,19 @@ Description: Run executable Java .jar files
 
 Package: javahelper
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, debhelper, devscripts,
-         bsdmainutils, dpkg-dev, dctrl-tools,
-         libarchive-zip-perl (>= 1.30-6~)
-Suggests: cvs,
-          gawk,
-          tofrodos,
+Depends:
+ bsdmainutils,
+ dctrl-tools,
+ debhelper,
+ 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.
@@ -48,7 +66,7 @@ Description: Helper scripts for packaging Java programs
  a provided spec so that the resultant jar files will work with
  jarwrapper-enabled packages.
  .
- jh_exec looks for symlinks to jars which should be executable 
+ jh_exec looks for symlinks to jars which should be executable
  and makes them executable
  .
  jh_build builds java files to jars for you.
@@ -69,7 +87,7 @@ Description: Helper scripts for packaging Java programs
  /usr/share/javahelper/java-vars.mk provides a selection of useful
  variables such as various JVM paths and the JVM name for the architecture
  .
- /usr/share/javahelper/java-arch.sh converts Debian architecture 
+ /usr/share/javahelper/java-arch.sh converts Debian architecture
  names into java names to locate libjvm.so in non-make build systems
  .
  javahelper provides CDBS and dh macros so that it can be used with those
@@ -81,12 +99,15 @@ Description: Helper scripts for packaging Java programs
 
 Package: java-propose-classpath
 Architecture: all
-Depends: gcj-jdk, javahelper (= ${binary:Version}), fastjar, ${misc:Depends}
+Depends:
+ fastjar,
+ gcj-jdk,
+ javahelper (= ${binary:Version}),
+ ${misc:Depends}
 Description: Helper script to suggest a classpath for jar files
  java-propose-classpath analyzes a set of jar files and the installed
  jars on the system to suggest a correct classpath for use with
  jh_classpath/jh_manifest
- . 
+ .
  This package should not be in any build-depends since java-propose-classpath
  cannot be run automatically.
-
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/

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