diff -Nru mozjs38-38.2.1~rc0/debian/changelog mozjs38-38.2.1~rc0/debian/changelog --- mozjs38-38.2.1~rc0/debian/changelog 2016-02-06 09:18:23.000000000 +0000 +++ mozjs38-38.2.1~rc0/debian/changelog 2017-02-17 22:59:49.000000000 +0000 @@ -1,3 +1,31 @@ +mozjs38 (38.2.1~rc0-0ubuntu3) zesty; urgency=medium + + * Really drop manual -dbg packages + + -- Jeremy Bicha Fri, 17 Feb 2017 17:59:49 -0500 + +mozjs38 (38.2.1~rc0-0ubuntu2) zesty; urgency=medium + + * debian/control: + - Build-Depend on libicu-dev, libreadline-dev and python-dev + * debian/rules: Copy these build flags from Fedora: + --with-system-icu + --with-system-zlib + --enable-readline + --enable-xterm-updates + --enable-shared-js + --enable-gcgenerational + --disable-optimize + --enable-pie + * debian/rules: + - Also use --enable-tests but don't make tests fatal yet + - Use --with-intl-api as recommended by gjs developer + * Don't install .a file + * Bump dh compat to 10 but disable autoreconf until it can be made to work + * Drop manual -dbg packages + + -- Jeremy Bicha Fri, 17 Feb 2017 17:32:04 -0500 + mozjs38 (38.2.1~rc0-0ubuntu1) zesty; urgency=medium [ Rico Tzschichholz] diff -Nru mozjs38-38.2.1~rc0/debian/compat mozjs38-38.2.1~rc0/debian/compat --- mozjs38-38.2.1~rc0/debian/compat 2016-02-06 09:18:23.000000000 +0000 +++ mozjs38-38.2.1~rc0/debian/compat 2017-02-17 22:59:49.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru mozjs38-38.2.1~rc0/debian/control mozjs38-38.2.1~rc0/debian/control --- mozjs38-38.2.1~rc0/debian/control 2016-02-06 09:18:23.000000000 +0000 +++ mozjs38-38.2.1~rc0/debian/control 2017-02-17 22:59:49.000000000 +0000 @@ -3,15 +3,16 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) -Build-Depends: debhelper (>= 9), - dh-autoreconf, +Build-Depends: debhelper (>= 10), autoconf2.13, + libicu-dev, libffi-dev, libnspr4-dev (>= 2:4.9.2), + libreadline-dev, zlib1g-dev (>= 1:1.2.3), pkg-config, pkg-kde-tools, - python, + python-dev, zip Standards-Version: 3.9.8 Homepage: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 @@ -25,20 +26,6 @@ JavaScript. It is intended to be embedded in other applications that provide host environments for JavaScript. -Package: libmozjs-38-0-dbg -Architecture: any -Multi-Arch: same -Section: debug -Priority: extra -Depends: libmozjs-38-0 (= ${binary:Version}), - ${misc:Depends} -Description: Spidermonkey JavaScript engine (debug symbols) - SpiderMonkey is the code-name for the Mozilla's C++ implementation of - JavaScript. It is intended to be embedded in other applications - that provide host environments for JavaScript. - . - This package contains the debug symbols. - Package: libmozjs-38-dev Architecture: any Section: libdevel @@ -65,17 +52,3 @@ that provide host environments for JavaScript. . This package contains js38 JavaScript interpreter. - -Package: libmozjs-38-bin-dbg -Architecture: any -Section: debug -Priority: extra -Depends: libmozjs-38-bin (= ${binary:Version}), - ${misc:Depends} -Description: Spidermonkey JavaScript shell (debug symbols) - SpiderMonkey is the code-name for the Mozilla's C++ implementation of - JavaScript. It is intended to be embedded in other applications - that provide host environments for JavaScript. - . - This package contains the debug symbols for the js38 JavaScript - interpreter. diff -Nru mozjs38-38.2.1~rc0/debian/libmozjs-38-dev.install mozjs38-38.2.1~rc0/debian/libmozjs-38-dev.install --- mozjs38-38.2.1~rc0/debian/libmozjs-38-dev.install 2016-02-06 09:18:23.000000000 +0000 +++ mozjs38-38.2.1~rc0/debian/libmozjs-38-dev.install 2017-02-17 22:59:49.000000000 +0000 @@ -1,5 +1,4 @@ usr/bin/js38-config usr/include/mozjs-38 -usr/lib/*/libmozjs-38.a usr/lib/*/libmozjs-38.so usr/lib/*/pkgconfig/mozjs-38.pc diff -Nru mozjs38-38.2.1~rc0/debian/patches/fix-icu-check.patch mozjs38-38.2.1~rc0/debian/patches/fix-icu-check.patch --- mozjs38-38.2.1~rc0/debian/patches/fix-icu-check.patch 1970-01-01 00:00:00.000000000 +0000 +++ mozjs38-38.2.1~rc0/debian/patches/fix-icu-check.patch 2017-02-17 22:59:49.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Skip nonworking version check by hardcoding icu version number + Yes, this fix isn't that great either. +--- + build/autoconf/icu.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/build/autoconf/icu.m4 ++++ b/build/autoconf/icu.m4 +@@ -73,7 +73,8 @@ if test -n "$USE_ICU"; then + fi + fi + +- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` ++ #version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` ++ version=57.1 + if test x"$version" = x; then + AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno]) + fi diff -Nru mozjs38-38.2.1~rc0/debian/patches/series mozjs38-38.2.1~rc0/debian/patches/series --- mozjs38-38.2.1~rc0/debian/patches/series 2016-02-06 09:18:23.000000000 +0000 +++ mozjs38-38.2.1~rc0/debian/patches/series 2017-02-17 22:59:49.000000000 +0000 @@ -10,3 +10,4 @@ install-js-config-h.patch shell-version.patch pkg-config-version.patch +fix-icu-check.patch diff -Nru mozjs38-38.2.1~rc0/debian/rules mozjs38-38.2.1~rc0/debian/rules --- mozjs38-38.2.1~rc0/debian/rules 2016-02-06 09:18:23.000000000 +0000 +++ mozjs38-38.2.1~rc0/debian/rules 2017-02-17 22:59:49.000000000 +0000 @@ -4,6 +4,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export AUTOCONF = autoconf2.13 + DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -25,7 +27,7 @@ endif %: - dh $@ --sourcedirectory=$(SRCDIR) --parallel --with pkgkde-symbolshelper + dh $@ --sourcedirectory=$(SRCDIR) --with pkgkde-symbolshelper --without autoreconf override_dh_clean: dh_clean @@ -46,13 +48,21 @@ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --libdir=/usr/lib/${DEB_HOST_MULTIARCH}/ \ + --with-system-icu \ --with-system-nspr \ - --disable-tests \ + --with-system-zlib \ + --enable-tests \ --disable-strip \ --enable-ctypes \ --enable-threadsafe \ --enable-system-ffi \ - --without-intl-api \ + --with-intl-api \ + --enable-readline \ + --enable-xterm-updates \ + --enable-shared-js \ + --enable-gcgenerational \ + --disable-optimize \ + --enable-pie \ $(CONFIGURE_FLAGS) override_dh_install: @@ -62,17 +72,13 @@ mv libmozjs-38.so libmozjs-38.so.0.0.0 && \ ln -s libmozjs-38.so.0.0.0 libmozjs-38.so.0 && \ ln -s libmozjs-38.so.0 libmozjs-38.so + rm debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libmozjs-38.a dh_install --fail-missing override_dh_fixperms: dh_fixperms chmod a-x $(CURDIR)/debian/libmozjs-38-dev/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mozjs-38.pc -override_dh_strip: - dh_strip -p libmozjs-38-0 --dbg-package=libmozjs-38-0-dbg - dh_strip -p libmozjs-38-bin --dbg-package=libmozjs-38-bin-dbg - dh_strip - override_dh_auto_test: ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) make -C $(SRCDIR) -k check || true diff -Nru mozjs38-38.2.1~rc0/debian/watch mozjs38-38.2.1~rc0/debian/watch --- mozjs38-38.2.1~rc0/debian/watch 2016-02-06 09:18:23.000000000 +0000 +++ mozjs38-38.2.1~rc0/debian/watch 2017-02-17 22:59:49.000000000 +0000 @@ -1,3 +1,2 @@ version=3 -opts=uversionmangle=s/(.*)/38.$1/ \ -https://ftp.mozilla.org/pub/mozilla.org/js/mozjs-38.(.*)\.tar\.bz2 +https://archive.mozilla.org/pub/firefox/releases/38([\d\.]+)esr/source/firefox-([\d\.]+)esr.source\.tar\.bz2