[libreoffice-online] 02/05: optimize B-D; move npm, node-jake, python, python-polib to Build-Depends-Indep

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice-online.

commit 6d584b3fedd85586ab41d99dc1155dfa15bdec53
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 14 21:45:16 2017 +0100

    optimize B-D; move npm, node-jake, python, python-polib to Build-Depends-Indep
---
 debian/control                   |  3 ++-
 debian/patches/no-npm-check.diff | 26 ++++++++++++++++++++++++++
 debian/patches/series            |  3 ++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 456fb3b..2ee448b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: web
 Priority: optional
 Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 9), debhelper (>= 10.9.2), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.8.0), libreofficekit-dev (>= 1:5.3~), dh-autoreconf, libreoffice-core (>= 1:5.3~), cpio, npm, libcppunit-dev, node-jake, python, python-polib, zlib1g-dev, pkg-config
+Build-Depends: debhelper (>= 9), debhelper (>= 10.9.2), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.8.0), libreofficekit-dev (>= 1:5.3~), dh-autoreconf, libreoffice-core (>= 1:5.3~), cpio, libcppunit-dev, zlib1g-dev, pkg-config
+Build-Depends-Indep: npm, node-jake, python, python-polib
 Standards-Version: 3.9.7
 
 Package: loolwsd
diff --git a/debian/patches/no-npm-check.diff b/debian/patches/no-npm-check.diff
new file mode 100644
index 0000000..649db55
--- /dev/null
+++ b/debian/patches/no-npm-check.diff
@@ -0,0 +1,26 @@
+don't check for npm in configure.ac so that we need it also for loolwsd-only
+builds. We only need it for binary-indep (loleaflet) builds.
+
+And that one calls npm and not the NPM set here.
+
+diff --git a/configure.ac b/configure.ac
+index 8aab94d..70944e7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -324,16 +325,6 @@ int main(int argc, char **argv)
+                [AC_MSG_RESULT([Yes])
+                 LIBS="$LIBS -lpcre"])
+ 
+-AC_PATH_PROG(NPM, npm, no)
+-if test "$NPM" = "no"; then
+-    AC_MSG_ERROR([npm required to build loleaflet, but not installed])
+-else
+-    NPM_VER=`npm -v | awk -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+-    if test "$NPM_VER" -ge 30900 -a "$NPM_VER" -lt 31004; then
+-        AC_MSG_ERROR([This npm version is buggy, either upgrade to >= 3.10.4 or downgrade to < 3.9.0])
+-    fi
+-fi
+-
+ test "$prefix" = NONE && prefix=$ac_default_prefix
+ LOOLWSD_CACHEDIR=${localstatedir}/cache/${PACKAGE}
+ while :; do
diff --git a/debian/patches/series b/debian/patches/series
index 5842888..1a63d79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 no-debian-postinst-in.diff
-lo-path.diff
 no-werror.diff
+no-npm-check.diff
+lo-path.diff
 etc-default.diff
 ssl-dir.diff
 logs.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-online.git