[libreoffice] 136/152: allow root builds on lp

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 33e698ad3f18277d60f4307c8c40e738dbd1a3cf
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Jan 23 17:56:49 2017 +0100

    allow root builds on lp
---
 changelog                            |  6 ++++++
 patches/allow-root-builds-on-lp.diff | 31 +++++++++++++++++++++++++++++++
 patches/series                       |  1 +
 3 files changed, 38 insertions(+)

diff --git a/changelog b/changelog
index bb8b1e2..1c1c0a9 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.3.0~rc1-2ubuntu1~zesty2) zesty; urgency=medium
+
+  * allow root builds on lp 
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Mon, 23 Jan 2017 17:58:32 +0100
+
 libreoffice (1:5.3.0~rc1-2ubuntu1~zesty1) zesty; urgency=medium
 
   * merge from Debian
diff --git a/patches/allow-root-builds-on-lp.diff b/patches/allow-root-builds-on-lp.diff
new file mode 100644
index 0000000..75a524d
--- /dev/null
+++ b/patches/allow-root-builds-on-lp.diff
@@ -0,0 +1,31 @@
+From 890347280ac08d676a1d08bf284fbce29b54fa61 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
+Date: Tue, 25 Oct 2016 11:38:06 +0200
+Subject: [PATCH 6/6] allow root builds on lp
+
+Change-Id: Ic809f277cfac5e26438667d331c1850f646e71f4
+---
+ Makefile.in | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index cf3e71f..3092c07 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -55,12 +55,7 @@ else # MAKE_RESTARTS
+ all: build
+ 
+ check-if-root:
+-	@if test `id -u` = 0; then \
+-		echo; \
+-		echo 'No. You make ME a sandwich.'; \
+-		echo; \
+-		exit 1; \
+-	fi
++	@true
+ 
+ gb_Side ?= host
+ 
+-- 
+2.7.4
+
diff --git a/patches/series b/patches/series
index 96b4822..a96196d 100644
--- a/patches/series
+++ b/patches/series
@@ -31,6 +31,7 @@ no-openssl.diff
 m68k-alignment.diff
 change-from-glew-to-epoxy.diff
 gtk3-opengl-slideshow.diff
+allow-root-builds-on-lp.diff
 #lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 #integraltrans.diff
 #mysqlc-boost-fallthrough.diff

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