[Libreoffice-commits] online.git: loolwsd/debian

[Jan Holesovsky]

 loolwsd/debian/changelog |    8 ++++++--
 loolwsd/debian/rules     |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2100dc84897517f8ddc90136547e9547bc6ff381
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Aug 5 17:38:42 2016 +0100

    Update the .deb changelog, and allow passing params.

diff --git a/loolwsd/debian/changelog b/loolwsd/debian/changelog
index bfb559a..7e18298 100644
--- a/loolwsd/debian/changelog
+++ b/loolwsd/debian/changelog
@@ -1,8 +1,12 @@
-loolwsd (1.0.34-1) UNRELEASED; urgency=medium
+loolwsd (1.8.0-1) unstable; urgency=medium
 
+  [ Tor Lillqvist ]
   * Back to packaging this for Debian.
 
- -- Tor Lillqvist <tml at collabora.com>  Wed, 03 Jun 2015 20:24:50 +0300
+  [ Jan Holesovsky ]
+  * Update to match Collabora Office 5.1
+
+ -- Jan Holesovsky <kendy at collabora.com>  Fri, 05 Aug 2016 16:51:54 +0100
 
 loolwsd (1.0.0-1) unstable; urgency=low
 
diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 519ac1a..622daf9 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/debian/rules
@@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 
 include /usr/share/dpkg/default.mk
 
-CONFFLAGS = --prefix=/usr --localstatedir=/var --sysconfdir=/etc --with-lokit-path=`pwd`/bundled/include
+CONFFLAGS = --prefix=/usr --localstatedir=/var --sysconfdir=/etc --with-lokit-path=`pwd`/bundled/include $(CONFIG_OPTIONS)
 
 # Avoid setcap when doing "make", when building for packaging
 # the setcap is done at installation time