[pkg-java] r8266 - trunk/java-common/debian

[Matthias Klose]

Author: doko
Date: 2009-05-18 11:31:58 +0000 (Mon, 18 May 2009)
New Revision: 8266

Modified:
   trunk/java-common/debian/changelog
   trunk/java-common/debian/control
   trunk/java-common/debian/rules
Log:
java-common (0.32) unstable; urgency=low

  * Build the default-* packages on hppa.

 -- Matthias Klose <doko at debian.org>  Sun, 17 May 2009 23:21:22 +0200

java-common (0.31) unstable; urgency=low

  * Build the default-* packages on alpha again.

 -- Matthias Klose <doko at debian.org>  Sun, 01 Feb 2009 12:41:46 +0100


Modified: trunk/java-common/debian/changelog
===================================================================
--- trunk/java-common/debian/changelog	2009-05-16 16:21:19 UTC (rev 8265)
+++ trunk/java-common/debian/changelog	2009-05-18 11:31:58 UTC (rev 8266)
@@ -1,3 +1,15 @@
+java-common (0.32) unstable; urgency=low
+
+  * Build the default-* packages on hppa.
+
+ -- Matthias Klose <doko at debian.org>  Sun, 17 May 2009 23:21:22 +0200
+
+java-common (0.31) unstable; urgency=low
+
+  * Build the default-* packages on alpha again.
+
+ -- Matthias Klose <doko at debian.org>  Sun, 01 Feb 2009 12:41:46 +0100
+
 java-common (0.30) unstable; urgency=low
 
   * Fix description generation for default-jre. Closes: #476978.

Modified: trunk/java-common/debian/control
===================================================================
--- trunk/java-common/debian/control	2009-05-16 16:21:19 UTC (rev 8265)
+++ trunk/java-common/debian/control	2009-05-18 11:31:58 UTC (rev 8266)
@@ -5,11 +5,11 @@
 Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: debiandoc-sgml, docbook-utils, docbook-xml, dpsyco-devel, lynx
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
 
 Package: java-common
 Architecture: all
-Suggests: equivs
+Suggests: default-jre, equivs
 Description: Base of all Java packages
  This package must be installed in the system if a Java environment
  is desired. It covers useful information for Java users in

Modified: trunk/java-common/debian/rules
===================================================================
--- trunk/java-common/debian/rules	2009-05-16 16:21:19 UTC (rev 8265)
+++ trunk/java-common/debian/rules	2009-05-18 11:31:58 UTC (rev 8266)
@@ -25,12 +25,23 @@
 dversion	= 1.5-$(jrel)
 jvmdir		= java-gcj
 
-ifneq (,$(filter $(DEB_HOST_ARCH), alpha arm hppa))
+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
+endif
+
 jre_provides	= $(call mk_cslist,$(provides),runtime)
 jhl_provides	= $(call mk_cslist,$(provides),runtime-headless)
 jdk_provides	= $(call mk_cslist,$(provides),sdk)