Last commit made on 2014-01-14
Get this branch:
git clone -b ubuntu/trusty https://git.launchpad.net/ubuntu/+source/javatools
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

d593186... by Logan Rosen on 2013-12-02

Import patches-unapplied version 0.45ubuntu1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 028d6cf8c003e30cdff65a89c711273a81d0ebd3

New changelog entries:
  [ Logan Rosen ]
  * Merge from Debian unstable. Remaining changes:
    - Pre-generate tutorial.html; remove the build dependency on markdown.
  [ Iain Lane ]
  * Also merge 0.43ubuntu3
    - Fix the java architecture for arm64 and ppc64el.

028d6cf... by Niels Thykier on 2013-10-06

Import patches-unapplied version 0.45 to debian/sid

Imported using git-ubuntu import.

Changelog parent: b78b65fcf53693e34235d5b9b19ceea14f419edd

New changelog entries:
  * jh_manifest: Fix bug where "EXCLUDE_FIND" was not
    properly expanded (regression introduced in 0.44).
    Thanks to Daniel Schepler for reporting it.
    (Closes: #725440)
  * d/control: Fix typo of "and". Thanks to Pascal
    De Vuyst for reporting it. (Closes: #725335)

b78b65f... by Niels Thykier on 2013-09-24

Import patches-unapplied version 0.44 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 0f354dd90ad554dafb102accfc796381a5d41b4a

New changelog entries:
  * Add a new minor TAP based test suite.
  * Fix bug in jh_repack when removing empty directories.
    Thanks to Francesco Poli for reporting it and writing
    the patch. (Closes: #689788)
  * Fix the output path for javadoc generated by jh_build.
    Thanks to Jakub Adam for reporting it and writing the
    patch. (Closes: #692230)
  * jh_installeclipse: Allow any installed package to
    provide a .jar dependency, not just those with
    desired-state install. Thanks to Colin Watson for the
    patch (pulled from Ubuntu's javatools/0.43ubuntu2).
  * ManifestSection.pm: Always write fields in a
    predictable order. This fixes a FTBFS when the tests
    had a different order. Thanks to Damyan Ivanov for
    reporting this bug. (Closes: #723884)
  * jh_depends: Strip leading "file://" before looking for
    a jar file. Thanks to Rene Engelhard for the bug
    report. (Closes: #632821)
  * jh_installjavadoc: Apply patch from Markus Koschany to
    insert a default value for the "Author"-field when no
    author is provided. Also fix a typo in the generated
    doc-base file. (Closes: #625945)
  * jh_makepkg: Advise people to use mk_make for packges
    with a maven based build system. Thanks to Hilko
    Bengen for the suggestion. (Closes: #703376)
  * d/control: Use the canonical URL in the Vcs-* fields.
  * d/control: Bump Standards-Version to 3.9.4 - no
    changes required.

0f354dd... by Niels Thykier on 2012-06-20

Import patches-unapplied version 0.43 to debian/sid

Imported using git-ubuntu import.

Changelog parent: b267ed25a4d0d68e33cfa8de7cf605b2618a2fe1

New changelog entries:
  * Make jh_build pass -source 1.5 by default to javadoc if
    no -source parameter is explicitly given.
  * Make jh_build pass -target 1.5 by default to javac if
    neither -source nor -target is explicitly given.

b267ed2... by Niels Thykier on 2012-06-19

Import patches-unapplied version 0.42 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 101095fcce4bb2351844b78f557d2c248a94cccb

New changelog entries:
  * Add support for Java7 in jh_depends. The jvm "open" now
    defaults to any OpenJDK version. The "open6" and "open7"
    values can be used to depend on a specific one.

101095f... by Niels Thykier on 2012-03-13

Import patches-unapplied version 0.41 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 5c4f611f260f540e72a19e420f9af9f98c6bdaa7

New changelog entries:
  [ Sylvestre Ledru ]
  * jh_makepkg:
    - Switch the OpenJDK6 path to the multiarch one.
    - Remove the sun-java6 support since it has been
      removed from the archive
    - Provide the support for OpenJDK 7
    - Create the new package under the source format 3.0
    - -doc packages are now in the doc section.
  [ Niels Thykier ]
  * Produce a better error message when a non-existent Jar file is
    passed to jh_manifest.
  * Try to parse arguments passed via -O for jh_lib.sh as regular
    options, but ignore them if they are unknown. Previously, -O
    options was silently ignored.
  * Remove support for using the "sun" (and "sun6") JVM with
    jh_depends, as Debian is no longer ships the Sun/Oracle Java.
  * Bump libarchive-zip-perl depends as 1.30.5 was still affected
    by #654899.
  * jh_depends no longer emits dependencies with java-runtime or
    java2-runtime. The minimum generated dependency is now
  * Corrected class version calculation on big-endian architectures.
    Thanks to Kai Ruschenburg for the report and the correction.
    (Closes: #661632)
  * Use Standards-Versions 3.9.3 and the new DEP-5 URI in jh_makepkg
    for newly generated packages.
  * Bumped Standards-Versions 3.9.3 - no changes required.
  * Ensure the test suite fails if the java-arch.sh test fails.

5c4f611... by Niels Thykier on 2012-01-23

Import patches-unapplied version 0.40 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ba1017ee543418ba1e72eb1362499c1ce40402c6

New changelog entries:
  * Fixed a regression jh_build (introduced in 0.38).
    (Closes: #656872)
  * Fixed the java architecture for s390x.

ba1017e... by Niels Thykier on 2012-01-17

Import patches-unapplied version 0.39 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c5da68063272b63a854b7f26366a585c7cadec34

New changelog entries:
  * Corrected java-arch.sh output for armhf, sh4 and powerpcspe.

c5da680... by Niels Thykier on 2012-01-16

Import patches-unapplied version 0.38 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3f059febe2a5e5246f1ce60e7f5240f9c3776b3f

New changelog entries:
  * Added missing empty line the in d/control generated by jh_makepkg
  * Bumped debhelper compat to 8 in packages generated by jh_makepkg
  * Fixed the "find" expressions in jh_repack to only remove files
    named "*.jar" or "*.class". Thanks to Andrew Ross for the report.
    (Closes: #646514)
  * Fixed a bug where jh_build would generate manifests with lines
    longer than some jar implementations would allow. Thanks to
    Giovanni Mascellani for the report. (Closes: #653412)
  * Fixed a bug where java-propose-classpath would "hide" javax imports.
    Thanks to Jan Janak for the report and the correction.
    (Closes: #653731)
  * Bumped dependency on libarchive-zip-perl due to some issues with
    the previous version that caused corrupt jar files. For more
    information, please refer to #654899. Thanks to Wookey for the
    analysis and for identifying the source of the issue.
    (Closes: #634089)

3f059fe... by Niels Thykier on 2011-07-06

Import patches-unapplied version 0.37 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7a17fc9bec8476254a8914324d126fa24041d7b0

New changelog entries:
  [ Niels Thykier ]
  * Do not assume that $pkg/usr/share/doc is present when jh_depends
    runs. (Closes: #632620)
  * Applied changes from NMU.
    - depend on gcj-jdk rather than gcj for java-propose-classpath.
  * Added support for -s/--same-arch in jh_lib and related shell
    scripts. (Closes: #632619)
  [ Matthew Johnson ]
  * Default to -source 1.5 in jh_build unless specified in the extra
    args (Closes: #591874)