diff options
| author | Damien Raude-Morvan <drazzib@debian.org> | 2013-08-17 18:36:15 +0000 |
|---|---|---|
| committer | Damien Raude-Morvan <drazzib@debian.org> | 2013-08-17 18:36:15 +0000 |
| commit | 4201bef60e3faf323f29a8b5f8e02a86c3034a0a (patch) | |
| tree | 6460d9ee9c63fc21282a93a63daafb2929f44d55 | |
| parent | 762cb123f911f835737316225d12a85c13696cef (diff) | |
| download | java-common-4201bef60e3faf323f29a8b5f8e02a86c3034a0a.tar.gz | |
* Team upload.
* Promote openjdk-7 as default-java on kfreebsd-{i386,amd64}.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/java_defaults.mk | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 257a000..878a732 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +java-common (0.50) UNRELEASED; urgency=low + + * Team upload. + * Promote openjdk-7 as default-java on kfreebsd-{i386,amd64}. + + -- Damien Raude-Morvan <drazzib@debian.org> Sat, 17 Aug 2013 20:34:17 +0200 + java-common (0.49) unstable; urgency=low [ Sylvestre Ledru ] diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk index 4f4fd0c..7eaa34d 100644 --- a/debian/java_defaults.mk +++ b/debian/java_defaults.mk @@ -4,11 +4,12 @@ java8_architectures = java7_architectures = alpha amd64 armel armhf arm64 i386 ia64 lpia \ - powerpc ppc64 s390x sh4 sparc sparc64 + kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 \ + s390x sh4 sparc sparc64 java6_architectures = $(java7_architectures) \ mips mipsel powerpcspe s390 java5_architectures = $(java6_architectures) \ - hppa m68k x32 kfreebsd-amd64 kfreebsd-i386 hurd-i386 + hppa m68k x32 hurd-i386 java_architectures = $(java5_architectures) _java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH)) |