[Libreoffice-commits] online.git: 3 commits - loolwsd/configure.ac loolwsd/loolwsd-systemplate-setup

[Tor Lillqvist]

 loolwsd/configure.ac              |    2 +-
 loolwsd/loolwsd-systemplate-setup |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d39fa21d64f78c2a185f1c32c019359bc5e1774b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jul 7 12:49:52 2015 +0300

    Bump version after tarball

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index f830ca9..4ce0d45 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.1.4], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.1.5], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 44074286a374a9f6f349cfe4f518021340aa5b62
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jul 7 12:44:37 2015 +0300

    Bump version for tarball

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 0310075..f830ca9 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.1.3], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.1.4], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit b0f2b06fcaed6607cdb2177239c51e74dae6ba88
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jul 7 12:44:16 2015 +0300

    Add the libnss* pathnames for Debian, too

diff --git a/loolwsd/loolwsd-systemplate-setup b/loolwsd/loolwsd-systemplate-setup
index 6cd6fca..a3ce239 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -29,9 +29,12 @@ cd / || exit 1
 	     var/cache/fontconfig \
 	     etc/fonts \
 	     usr/share/liblangtag \
+	     lib/*-linux-gnu/libnss* \
 		 -type f
 
+
 	find lib/libnss_* lib64/libnss_* -type l
+	find lib/*-linux-gnu/libnss* -type l
 
 	# Go through the LO shared objects and check what system libraries
 	# they link to.