diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 50 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rwxr-xr-x | debian/rules | 35 |
3 files changed, 67 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog index c6c59af..4d28ac0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,18 @@ -java-common (0.33) UNRELEASED; urgency=low +java-common (0.33) unstable; urgency=low + [ Matthias Klose ] * Set package sections to java. - -- Matthias Klose <doko@debian.org> Mon, 18 May 2009 14:18:43 +0200 + [ Torsten Werner ] + * Add myself to Uploaders. + * Add a local copy of debian-java-faq to avoid network (CVS) access during + build time. + * Sync with Ubuntu: + - Switch to OpenJDK as the default JDK/JRE. + * Update Standards-Version: 3.8.2: + - Add Vcs headers to debian/control. + + -- Torsten Werner <twerner@debian.org> Thu, 30 Jul 2009 15:16:06 +0200 java-common (0.32) unstable; urgency=low @@ -16,6 +26,42 @@ java-common (0.31) unstable; urgency=low -- Matthias Klose <doko@debian.org> Sun, 01 Feb 2009 12:41:46 +0100 +java-common (0.30ubuntu5) karmic; urgency=low + + * default-jdk-builddep: Depend on gcj-jdk instead of java-gcj-compat-dev. + * Build for hppa. + + -- Matthias Klose <doko@ubuntu.com> Mon, 27 Apr 2009 13:36:36 +0200 + +java-common (0.30ubuntu4) jaunty; urgency=low + + * Default to openjdk-6 on armel. + + -- Matthias Klose <doko@ubuntu.com> Mon, 17 Nov 2008 08:03:21 +0100 + +java-common (0.30ubuntu3) intrepid; urgency=low + + * On powerpc, default back to openjdk-6 instead of cacao-oj6. Still + more testsuite failures in the OpenJDK testsuite with cacao compared + to the zero port. + + -- Matthias Klose <doko@ubuntu.com> Mon, 13 Oct 2008 18:09:39 +0000 + +java-common (0.30ubuntu2) intrepid; urgency=low + + * debian/rules + - Fix jvmdir for powerpc, so that default-java symlink is correct. + (LP: #256949) + + -- Onkar Shinde <onkarshinde@ubuntu.com> Wed, 13 Aug 2008 01:55:23 +0530 + +java-common (0.30ubuntu1) intrepid; urgency=low + + * On amd64, i386, ia64 and sparc, point default-* to openjdk-6, + on powerpc, point to cacao-oj6. + + -- Matthias Klose <doko@ubuntu.com> Wed, 30 Jul 2008 14:41:31 +0200 + java-common (0.30) unstable; urgency=low * Fix description generation for default-jre. Closes: #476978. diff --git a/debian/control b/debian/control index 73a8937..960d1ca 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,12 @@ Source: java-common Section: java Priority: optional Maintainer: Debian Java Mailing List <debian-java@lists.debian.org> -Uploaders: Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Michael Koch <konqueror@gmx.de>, Matthias Klose <doko@debian.org> +Uploaders: Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Michael Koch <konqueror@gmx.de>, Matthias Klose <doko@debian.org>, Torsten Werner <twerner@debian.org> Build-Depends: debhelper (>= 5) Build-Depends-Indep: debiandoc-sgml, docbook-utils, docbook-xml, dpsyco-devel, lynx -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-common +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/java-common/ Package: java-common Architecture: all diff --git a/debian/rules b/debian/rules index f69bbae..bd17f00 100755 --- a/debian/rules +++ b/debian/rules @@ -15,31 +15,26 @@ jrel = $(subst java-common-0.,,$(notdir $(CURDIR))) DPKG_VARS := $(shell dpkg-architecture) DEB_HOST_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH) -p_jre = java-gcj-compat -p_jhl = java-gcj-compat-headless -p_jdk = java-gcj-compat-dev +p_jre = gcj-jre +p_jhl = gcj-jre-headless +p_jdk = gcj-jdk jdk_build_dep = -v_jre = $(S)(>= 1.0.77-4) +v_jre = v_jdk = $(v_jre) provides = java java2 java5 dversion = 1.5-$(jrel) jvmdir = java-gcj -ifneq (,$(filter $(DEB_HOST_ARCH), arm)) - p_jre = - p_headless = - p_jdk = -endif - -ifneq (,$(filter $(DEB_HOST_ARCH), hppa)) - p_jre = gcj-jre - p_jhl = gcj-jre-headless - p_jdk = gcj-jdk - v_jre = - v_jdk = - provides = java java2 java5 - dversion = 1.5-$(jrel) - jvmdir = java-gcj +ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel i386 ia64 lpia mips mipsel powerpc s390 sparc)) + p_jre = openjdk-6-jre + p_jhl = openjdk-6-jre-headless + p_jdk = openjdk-6-jdk + jdk_build_dep = gcj-jdk + v_jre = $(S)(>= 6b14) + v_jdk = $(v_jre) + provides = java java2 java5 java6 + dversion = 1.6-$(jrel) + jvmdir = java-6-openjdk endif jre_provides = $(call mk_cslist,$(provides),runtime) @@ -104,7 +99,7 @@ ifneq (,$(p_jre)) '-Vjre=$(p_jre)' \ '-Vjhl=$(p_jhl)' \ '-Vjdk=$(p_jdk)' \ - '-Vjdk:builddep=$(jdk_builddep)' \ + '-Vjdk:builddep=$(jdk_build_dep)' \ '-Vjre:arch=$(DEB_HOST_ARCH)' \ '-Vjre:version=$(v_jre)' \ '-Vjdk:version=$(v_jdk)' \ |