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 98d97e07276a564209a8f04fd28ea72183cd3655 Author: Emmanuel Bourg <[email protected]> Date: Sun Mar 30 23:55:26 2014 +0200 Assume NSS is always enabled --- debian/rules | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/debian/rules b/debian/rules index 4bf7cd1..87cf5ba 100755 --- a/debian/rules +++ b/debian/rules @@ -281,7 +281,6 @@ endif with_pulse = yes with_bridge = atk -with_nss = yes with_tzdata = yes on_buildd := $(shell [ -f /CurrentlyBuilding -o "$$LOGNAME" = buildd ] && echo yes) @@ -470,12 +469,6 @@ endif CONFIGURE_ARGS += --enable-system-lcms -ifeq ($(with_nss),yes) - CONFIGURE_ARGS += --enable-nss -else ifeq ($(with_nss),no) - CONFIGURE_ARGS += --disable-nss -endif - ifeq ($(with_systemtap),yes) CONFIGURE_ARGS += --enable-systemtap --with-abs-install-dir=/$(basedir) endif @@ -586,12 +579,10 @@ bd_mauve = mauve, ifeq ($(with_pulse),yes) bd_pulsejava = libpulse-dev (>= 0.9.12), endif -ifeq ($(with_nss),yes) - ifneq (,$(filter $(distrel),wheezy sid)) - bd_nss = libnss3-dev (>= 2:3.13.4), - else - bd_nss = libnss3-dev (>= 3.12.9+ckbi-1.82-0ubuntu4), - endif +ifneq (,$(filter $(distrel),wheezy sid)) + bd_nss = libnss3-dev (>= 2:3.13.4), +else + bd_nss = libnss3-dev (>= 3.12.9+ckbi-1.82-0ubuntu4), endif ifeq ($(with_systemtap),yes) bd_systemtap = systemtap-sdt-dev, @@ -604,12 +595,10 @@ endif dlopen_hl_depends = \ libcups2, liblcms2-2, \ $(if $(findstring jpeg8, $(bd_syslibs)),libjpeg8,libjpeg62) -ifneq ($(with_nss),no) - ifneq (,$(filter $(distrel), wheezy sid)) - dlopen_hl_depends += , libnss3 (>= 2:3.13.4) - else - dlopen_hl_depends += , libnss3-1d (>= 3.12.9+ckbi-1.82-0ubuntu4) - endif +ifneq (,$(filter $(distrel), wheezy sid)) + dlopen_hl_depends += , libnss3 (>= 2:3.13.4) +else + dlopen_hl_depends += , libnss3-1d (>= 3.12.9+ckbi-1.82-0ubuntu4) endif dlopen_hl_depends += , libpcsclite1 dlopen_hl_recommends = -- 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
