[Libreoffice-commits] online.git: 2 commits - loolwsd/discovery.xml loolwsd/Makefile.am

[Andras Timar]

 loolwsd/Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 638460381eb85f9f65d98b46d211698e8b1daaf1
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Mar 17 15:24:09 2016 +0100

    package and deploy discovery.xml

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index c7ffb5d..075beaf 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = test
 
 bin_PROGRAMS = loolwsd loolbroker loolkit loolmap
 
-dist_bin_SCRIPTS = loolwsd-systemplate-setup
+dist_bin_SCRIPTS = loolwsd-systemplate-setup discovery.xml
 
 AM_CPPFLAGS = -pthread
 AM_LDFLAGS = -pthread
@@ -33,7 +33,7 @@ noinst_HEADERS = LOKitHelper.hpp LOOLProtocol.hpp LOOLSession.hpp MasterProcessS
                  bundled/include/LibreOfficeKit/LibreOfficeKit.h bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
                  bundled/include/LibreOfficeKit/LibreOfficeKitInit.h bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h
 
-EXTRA_DIST = loolwsd.service sysconfig.loolwsd
+EXTRA_DIST = loolwsd.service sysconfig.loolwsd discovery.xml
 
 clean-cache:
 # Intentionally don't use "*" below... Avoid risk of accidentally running rm -rf /*
commit 2b313593467b9ac2d106886f437e05bdf7e62527
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Mar 17 15:22:35 2016 +0100

    chmod -x

diff --git a/loolwsd/discovery.xml b/loolwsd/discovery.xml
old mode 100755
new mode 100644