[openjdk-8] 07/10: Removed the build dependency on Rhino

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit deebed086d0cfaf9f28f024ce3bfce45eba4a8ff
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Mar 29 00:01:58 2014 +0100

    Removed the build dependency on Rhino
---
 debian/control    |  3 +--
 debian/control.in |  1 -
 debian/rules      | 23 +----------------------
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/debian/control b/debian/control
index 49992ad..ba8958d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: OpenJDK Team <openjdk at lists.launchpad.net>
 Uploaders: Matthias Klose <doko at ubuntu.com>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 5), binutils-dev [armel armhf], m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, wdiff, fastjar (>= 2:0.96-0ubuntu2),  autoconf, automake, autotools-dev, libtool, g++-4.8,  ecj-gcj [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el m68k mips mipsel sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64], gcj-jdk [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el mips mi [...]
+Build-Depends: debhelper (>= 5), binutils-dev [armel armhf], m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, wdiff, fastjar (>= 2:0.96-0ubuntu2),  autoconf, automake, autotools-dev, libtool, g++-4.8,  ecj-gcj [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el m68k mips mipsel sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64], gcj-jdk [amd64 armel armhf arm64 hppa i386 ia64 lpia powerpc powerpcspe ppc64 ppc64el mips mi [...]
 Standards-Version: 3.9.5
 Homepage: http://openjdk.java.net/
 Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk7
@@ -34,7 +34,6 @@ Suggests: ${cacao:Recommends}, libnss-mdns, sun-java6-fonts, fonts-dejavu-extra,
 Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
 Conflicts: ${multiarch:Conflicts}
 Breaks: icedtea-netx (<< 1.4-2)
-Built-Using: ${rhino:Source}
 Description: OpenJDK Java runtime, using ${vm:Name} (headless)
  Minimal Java runtime - needed for executing non GUI Java programs.
  Using ${vm:Name}.
diff --git a/debian/control.in b/debian/control.in
index 14bd6d3..0b6a743 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -34,7 +34,6 @@ Suggests: ${cacao:Recommends}, libnss-mdns, sun-java6-fonts, @core_fonts@, @cjk_
 Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
 Conflicts: ${multiarch:Conflicts}
 Breaks: icedtea-netx (<< 1.4-2)
-Built-Using: ${rhino:Source}
 Description: OpenJDK Java runtime, using ${vm:Name} (headless)
  Minimal Java runtime - needed for executing non GUI Java programs.
  Using ${vm:Name}.
diff --git a/debian/rules b/debian/rules
index 348a368..cbef0c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -542,19 +542,6 @@ ifeq (,$(filter $(DEB_HOST_ARCH), $(hotspot_archs) ia64 powerpc powerpcspe ppc64
   CONFIGURE_ARGS += --with-alt-jar=/usr/bin/fastjar
 endif
 
-ifneq (,$(filter $(DEB_HOST_ARCH), hppa))
-  CONFIGURE_ARGS += \
-	--without-rhino
-else
-  ifneq (,$(strip $(foreach i, hardy intrepid jaunty,$(findstring $(i),$(PKGVERSION)))))
-    CONFIGURE_ARGS += \
-	--with-rhino=/usr/share/java/js-1.7R2.jar
-  else
-    CONFIGURE_ARGS += \
-	--with-rhino=/usr/share/java/js.jar
-  endif
-endif
-
 CONFIGURE_ARGS += \
 	--disable-downloading \
 	--with-openjdk-src-zip=$(CURDIR)/openjdk.tar.gz \
@@ -721,10 +708,7 @@ bd_openjdk = \
 	libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, \
 	$(if $(filter $(distrel), etch hardy),libcupsys2-dev,libcups2-dev), \
 	libasound2-dev, liblcms$(lcms_version)-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, \
-	libxinerama-dev, xsltproc, librhino-java (>= 1.7R3~),
-ifeq (,$(filter $(distrel),lenny squeeze quantal precise oneiric natty maverick lucid karmic jaunty intrepid hardy gutsy feisty edgy dapper))
-  rhino_source := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W librhino-java)
-endif
+	libxinerama-dev, xsltproc,
 
 pkg_ffidev = $(if $(filter $(distribution),Ubuntu),$(if $(filter $(distrel),hardy),libffi4-dev,libffi-dev),libffi-dev)
 
@@ -958,10 +942,6 @@ control_vars += '-Vtzdata:Depends=$(pkg_tzdata)'
 pkg_jcommon = java-common (>= 0.28)
 control_vars += '-Vjcommon:Depends=$(pkg_jcommon)'
 
-ifneq (,$(rhino_source))
-  control_vars += "-Vrhino:Source=$(rhino_source)"
-endif
-
 debian/control: debian/control.in debian/rules
 	@cp -p debian/control debian/control.old
 	sed \
@@ -996,7 +976,6 @@ debian/control: debian/control.in debian/rules
 	    $(if $(jamvm_archs), debian/control.jamvm-jre) \
 	    $(if $(altzero_archs), debian/control.zero-jre) \
 	    $(if $(DEB_HOST_MULTIARCH),,| grep -v '^Multi-Arch') \
-	    $(if $(rhino_source),,| grep -v '^Built-Using') \
 		> debian/control
 	@if cmp -s debian/control debian/control.old; then \
 	  rm -f debian/control.old; \

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