ubuntu/+source/javatools:applied/ubuntu/oneiric-devel

Last commit made on 2011-07-08
Get this branch:
git clone -b applied/ubuntu/oneiric-devel 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

Name:
applied/ubuntu/oneiric-devel
Repository:
lp:ubuntu/+source/javatools

Recent commits

b24ae99... by Angel Abad on 2011-07-08

Import patches-applied version 0.37ubuntu1 to applied/ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: f318b9aa3cf349ccb674bb1e32324941a7b2d576
Unapplied parent: 1db921fa566afa539e5f733349c47941eb61dabf

New changelog entries:
  * Merge from debian unstable. (LP: #807047) Remaining changes:
    - Pre-generate tutorial.html; remove the build dependency on markdown.

1db921f... by Angel Abad on 2011-07-08

Import patches-unapplied version 0.37ubuntu1 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 3f059febe2a5e5246f1ce60e7f5240f9c3776b3f

New changelog entries:
  * Merge from debian unstable. (LP: #807047) Remaining changes:
    - Pre-generate tutorial.html; remove the build dependency on markdown.

f318b9a... by Niels Thykier on 2011-07-06

Import patches-applied version 0.37 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 7d3a3cb262163e59e77b452a452b119363c65895
Unapplied parent: 3f059febe2a5e5246f1ce60e7f5240f9c3776b3f

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)

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)

7d3a3cb... by Niels Thykier on 2011-06-04

Import patches-applied version 0.36 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 6a71f2c5832327bf8b40ce09e70101c1418dfdc8
Unapplied parent: 7a17fc9bec8476254a8914324d126fa24041d7b0

New changelog entries:
  * Made jh_manifest always follow symlinks - the fix for this in
    0.35 was incomplete. (Closes: #626329)

7a17fc9... by Niels Thykier on 2011-06-04

Import patches-unapplied version 0.36 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9d6a2ebd721d1cf36f22ad2ae3484b9847a8b9f1

New changelog entries:
  * Made jh_manifest always follow symlinks - the fix for this in
    0.35 was incomplete. (Closes: #626329)

6a71f2c... by Niels Thykier on 2011-05-14

Import patches-applied version 0.35 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 51df9226522ebaaec446cd985adaf604a59820fc
Unapplied parent: 9d6a2ebd721d1cf36f22ad2ae3484b9847a8b9f1

New changelog entries:
  * Made jh_manifest always follow symlinks even if they are passed
    via command line. (Closes: #626329)
  * Made jh_manifest fail if there are jar files it cannot find,
    unless the jar has been excluded. This may cause packages to
    FTBFS instead of silently not shipping a jar file.
    (Closes: #626327)
  * Improved support for --no-act in jh_manifest.
  * Made jh_depends ignore links to jars as these most likely points
    to real jar files that it will end up processing any way.
    (Closes: #610817)

9d6a2eb... by Niels Thykier on 2011-05-14

Import patches-unapplied version 0.35 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7bc37984017fb0b0dfea77e693947acdd0734dd8

New changelog entries:
  * Made jh_manifest always follow symlinks even if they are passed
    via command line. (Closes: #626329)
  * Made jh_manifest fail if there are jar files it cannot find,
    unless the jar has been excluded. This may cause packages to
    FTBFS instead of silently not shipping a jar file.
    (Closes: #626327)
  * Improved support for --no-act in jh_manifest.
  * Made jh_depends ignore links to jars as these most likely points
    to real jar files that it will end up processing any way.
    (Closes: #610817)

51df922... by Niels Thykier on 2011-04-29

Import patches-applied version 0.34 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 5470b9286931a01380a1a58716c4d2215ccc7760
Unapplied parent: 7bc37984017fb0b0dfea77e693947acdd0734dd8

New changelog entries:
  * Fixed a regression in 0.33 that in some cases would make
    jh_installlibs install in to the system root and not the package
    root. (Closes: #624503)
  * Removed the -O option from jh_build since it clashed with a
    common debhelper option. The longer form (--javadoc-opts) is
    still available and should be used instead.
  * Made all "jh_lib.sh"-based tools ignore the -O option, which is
    used by dh in some cases. If you have been using -O with
    jh_build please switch to --javadoc-opts instead.
    (Closes: #623506, #624388)

7bc3798... by Niels Thykier on 2011-04-29

Import patches-unapplied version 0.34 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7aedaf481bc4f735009ffed972b0c1a836ffbdec

New changelog entries:
  * Fixed a regression in 0.33 that in some cases would make
    jh_installlibs install in to the system root and not the package
    root. (Closes: #624503)
  * Removed the -O option from jh_build since it clashed with a
    common debhelper option. The longer form (--javadoc-opts) is
    still available and should be used instead.
  * Made all "jh_lib.sh"-based tools ignore the -O option, which is
    used by dh in some cases. If you have been using -O with
    jh_build please switch to --javadoc-opts instead.
    (Closes: #623506, #624388)