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 c0d1e77121af23e2dd6106e797e1306713e11d3c Author: Emmanuel Bourg <[email protected]> Date: Mon Mar 31 01:33:03 2014 +0200 Removed the unused build compression option --- debian/rules | 17 ----------------- debian/templates/control.in | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/debian/rules b/debian/rules index bbc6150..dfb3d46 100755 --- a/debian/rules +++ b/debian/rules @@ -491,13 +491,6 @@ all_jdk_tools = $(filter-out javaws, $(notdir $(wildcard build/$(sdkimg)/bin/*)) jdk_tools = $(filter-out $(all_jre_tools), $(all_jdk_tools)) jdk_tools_alt = $(filter-out apt java-rmi.cgi, $(jdk_tools)) -ifeq ($(distribution),Ubuntu) - pkg_compress = lzma -else - pkg_compress = bzip2 -endif -pkg_compress = - # build dependencies bd_autotools = autoconf, automake, autotools-dev, # This section should be in sync with "GCJ_SUFFIX" definition @@ -570,7 +563,6 @@ ifneq (,$(cacao_archs)) endif bd_fastjar = fastjar (>= 2:0.96-0ubuntu2), -bd_compress = $(pkg_compress), bd_xvfb = xvfb, xauth, xfonts-base, libgl1-mesa-dri [!x32], $(bd_wm) x11-xkb-utils, bd_mauve = mauve, ifeq ($(with_pulse),yes) @@ -672,14 +664,6 @@ control_vars = \ '-Vpkg:pulseaudio=$(pkg_pulseaudio)' \ '-Vxulrunner:Depends=$(xulrunner_depends)' \ -ifeq ($(pkg_compress),lzma) - bd_options = -- -Zlzma - control_vars += '-Vdpkg:Depends=dpkg (>= 1.14.12ubuntu3)' -else ifeq ($(pkg_compress),bzip2) - bd_options = -- -Zbzip2 - control_vars += '-Vdpkg:Depends=dpkg (>= 1.10.24)' -endif - ifneq (,$(DEB_HOST_MULTIARCH)) control_vars += \ '-Vmultiarch:Depends=multiarch-support' \ @@ -745,7 +729,6 @@ debian/control: debian/templates/control.in debian/rules -e 's/@bd_fastjar@/$(bd_fastjar)/g' \ -e 's/@bd_mauve@/$(bd_mauve)/g' \ -e 's/@bd_xvfb@/$(bd_xvfb)/g' \ - -e 's/@bd_compress@/$(pkg_compress)/g' \ -e 's/@bd_cacao@/$(bd_cacao)/g' \ -e 's/@bd_jamvm@/$(bd_jamvm)/g' \ -e 's/@bd_pulsejava@/$(bd_pulsejava)/g' \ diff --git a/debian/templates/control.in b/debian/templates/control.in index 92ad128..815ff11 100644 --- a/debian/templates/control.in +++ b/debian/templates/control.in @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: OpenJDK Team <[email protected]> Uploaders: Matthias Klose <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: debhelper (>= 5), binutils-dev [armel armhf], m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, wdiff, @bd_fastjar@ @bd_compress@ @bd_autotools@ @bd_cacao@ @bd_jamvm@ @bd_gcc@ @bd_bootstrap@ @bd_openjdk@ @bd_zero@ @bd_shark@ @bd_syslibs@ @bd_pulsejava@ @bd_nss@ @bd_systemtap@ @bd_mauve@ @bd_xvfb@ +Build-Depends: debhelper (>= 5), binutils-dev [armel armhf], m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, wdiff, @bd_fastjar@ @bd_autotools@ @bd_cacao@ @bd_jamvm@ @bd_gcc@ @bd_bootstrap@ @bd_openjdk@ @bd_zero@ @bd_shark@ @bd_syslibs@ @bd_pulsejava@ @bd_nss@ @bd_systemtap@ @bd_mauve@ @bd_xvfb@ Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/pkg-java/openjdk-8.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/openjdk-8.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
