lp:~scarneiro/ubuntu/quantal/java-common/merge-from-debian

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu/quantal/java-common

Ubuntu branches: Pending requested 2012-06-01

Diff: 144 lines (+75/-7)

5 files modified

debian/changelog (+35/-3)
debian/control (+1/-1)
debian/java-common.postinst (+21/-0)
debian/java-common.postrm (+11/-0)
debian/rules (+7/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

31. By Sebastian Carneiro on 2012-06-01

* Merge with Debian; remaining changes:
  - Default to OpenJDK 7.
  - Keep old jvm symlinks in the openjdk-6-jre-headless package.
* Add creation and removal of /etc/.java (common to different OpenJDK
  versions) in java-common maintainer scripts. Closes: #660604.
* Remove Michael from the uploaders list. Closes: #654029.
* java-common: Mark it as Multi-Arch: foreign.
* Fixed FTBFS due to build depending on build-indep.
* Added build-arch target to d/rules.
* Bumped Standards-Versions to 3.9.2 - no changes required.

30. By Matthias Klose on 2012-04-27

Default to OpenJDK 7.

29. By Matthias Klose on 2011-12-02

java-common: Mark it as Multi-Arch: foreign.

28. By Matthias Klose on 2011-10-20

Keep old jvm symlinks in the openjdk-6-jre-headless package.

27. By Matthias Klose on 2011-09-27

Fix the deault java symlink.

26. By Matthias Klose on 2011-08-27

* Merge with Debian; remaining changes:
  - Default to OpenJDK on ppc64.

25. By Matthias Klose on 2010-11-20

Default to OpenJDK on ppc64.

24. By Torsten Werner on 2010-08-23

[ Niels Thykier ]
* Make openjdk-6 default on powerpcspe (Closes: #593627).
  - Thanks to Sebastian Andrzej Siewior.

[ Torsten Werner ]
* Add an epoch to the arch any packages because we downgrade them from 1.6-*
  to 1.5-* on mips.
  - This fixes the last upload on this architecture.
  - Set urgency to medium.

23. By Torsten Werner on 2010-08-09

Change default-jdk/jre(-headless) back to gcj on the mips architecture
because openjdk FTBFS there.

22. By Niels Thykier on 2010-07-01

* Updated the description of gcj-native-helper and also the
  previous changelog entry to clarify that gcj-native-helper
  is only a partial replacement for default-jdk-builddep.

  Please see README.gcj-native-transition in the java-common
  package for more information on the transition.
* Added missing Replaces/Conflicts for gcj-native-helper.
* Bumped Standards-Versions to 3.9.0 - no changes required.