[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - 2 commits - debian/changelog debian/rules loolwsd.spec.in

[Andras Timar]

 debian/changelog |    6 ++++++
 debian/rules     |    2 +-
 loolwsd.spec.in  |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 7f9cd88615059c6a580bcc308104a06d09ecaabf
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Apr 18 22:03:59 2018 +0200

    Bump package version to 2.1.6-2
    
    Change-Id: I752bb08ab76fb29721b0229cf4d096dcce8e9b8a

diff --git a/debian/changelog b/debian/changelog
index 730f3907c..2b54f0c4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.1.6-2) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool21
+
+ -- Andras Timar <andras.timar at collabora.com>  Wed, 18 Apr 2018 22:00:00 +0100
+
 loolwsd (2.1.6-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool21
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 44b840615..0daac5f7a 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:           loolwsd%{name_suffix}
 Name:           loolwsd
 %endif
 Version:        @PACKAGE_VERSION@
-Release:        1%{?dist}
+Release:        2%{?dist}
 %if 0%{?suse_version} == 1110
 Group:          Productivity/Office/Suite
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
commit 4f1d4ae6c19e7e9eccc549bfb9a9f758519d3459
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Mar 9 12:48:38 2018 +0100

    enable parallel make with deb package creation
    
    Change-Id: Ia84ca8a33a27cac8f1fcc3668a97ee3857d3c0d8
    (cherry picked from commit 5fb16d423dd0fde18b8dee8eb77aa425516a37f9)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/debian/rules b/debian/rules
index 6a278ba81..047ffbe26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ export BUILDING_FROM_RPMBUILD=yes
 
 # main packaging script based on dh7 syntax
 %:
-	dh $@ --with=systemd
+	dh $@ --with=systemd --parallel
 
 override_dh_auto_configure:
 	./configure $(CONFFLAGS)