[java-policy] 84/198: - Revert r6772

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository java-policy.

commit 593755e13197f317ab6a6ecc4ff2cf83e0966976
Author: Matthias Klose <doko at debian.org>
Date:   Sun Feb 1 11:59:06 2009 +0000

    - Revert r6772
---
 debian/changelog |  6 ------
 debian/rules     | 33 ++-------------------------------
 2 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eaa992c..316ab0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-java-common (0.31) UNRELEASED; urgency=low
-
-  * On alpha, point default-* to openjdk-6.
-
- -- Matthias Klose <doko at debian.org>  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/rules b/debian/rules
index 742dac7..e9c3757 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,36 +25,7 @@ provides	= java java2 java5
 dversion	= 1.5-$(jrel)
 jvmdir		= java-gcj
 
-#ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 ia64 lpia sparc))
-ifneq (,$(filter $(DEB_HOST_ARCH), alpha))
-  p_jre		= openjdk-6-jre
-  p_jhl		= openjdk-6-jre-headless
-  p_jdk		= openjdk-6-jdk
-  jdk_build_dep	= java-gcj-compat-dev
-  v_jre		= $(S)(>= 6b11)
-  v_jdk		= $(v_jre)
-  provides	= java java2 java5 java6
-  dversion	= 1.6-$(jrel)
-  jvmdir	= java-6-openjdk
-endif
-
-ifeq (0,1)
-ifneq (,$(filter $(DEB_HOST_ARCH), alpha powerpc))
-  p_jre		= cacao-oj6-jre
-  p_hl		= cacao-oj6-jre-headless
-  p_jdk		= cacao-oj6-jdk
-  ifeq (,$(filter $(DEB_HOST_ARCH), alpha))
-    jdk_build_dep	= java-gcj-compat-dev
-  endif
-  v_jre		=
-  v_jdk		=
-  provides	= java java2 java5 java6
-  dversion	= 1.6-$(jrel)
-  jvmdir	= cacao-6-openjdk
-endif
-endif
-
-ifneq (,$(filter $(DEB_HOST_ARCH), arm hppa))
+ifneq (,$(filter $(DEB_HOST_ARCH), alpha arm hppa))
   p_jre		=
   p_headless	=
   p_jdk		=
@@ -122,7 +93,7 @@ ifneq (,$(p_jre))
 		'-Vjre=$(p_jre)' \
 		'-Vjhl=$(p_jhl)' \
 		'-Vjdk=$(p_jdk)' \
-		'-Vjdk:builddep=$(jdk_build_dep)' \
+		'-Vjdk:builddep=$(jdk_builddep)' \
 		'-Vjre:arch=$(DEB_HOST_ARCH)' \
 		'-Vjre:version=$(v_jre)' \
 		'-Vjdk:version=$(v_jdk)' \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-policy.git