[libreoffice] 01/19: update and bring back Ubuntu palette patch
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-wily-5.0
in repository libreoffice.
commit f026e30932ff7583119ee6f67ae15b4a2b1f5412
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Jul 17 16:32:29 2015 +0200
update and bring back Ubuntu palette patch
- also make the Ubuntu palette separate instead of part of the standard
palette, where they get lost
---
...-readd-updated-Ubuntu-brand-palette-colors.diff | 38 ++++++++++++++--------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff b/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
index ddc2259..c04fda8 100644
--- a/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
+++ b/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
@@ -1,23 +1,33 @@
-From 015a6b487d008fb770bdf8d2b9aa36bf744eae55 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri, 21 Mar 2014 14:32:03 +0100
Subject: [PATCH] lp#753627: readd updated Ubuntu brand palette colors
Change-Id: I4720b415ca8cc27713d548f22a5de2bfe8be3074
---
- extras/source/palettes/standard.soc | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ extras/Package_palettes.mk | 1 +
+ extras/source/palettes/ubuntu.soc | 11 +++++++++++
+ 2 files changed, 12 insertions(+)
+ create mode 100644 extras/source/palettes/ubuntu.soc
-diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc
-index a174401..eebc00d 100644
---- a/extras/source/palettes/standard.soc
-+++ b/extras/source/palettes/standard.soc
-@@ -197,4 +197,13 @@
- <draw:color draw:name="Chart 12" draw:color="#0084d1"/>
- <draw:color draw:name="Tango: Sky Blue 1" draw:color="#729fcf"/>
- <draw:color draw:name="Tango: Sky Blue 2" draw:color="#3465a4"/>
-+
-+ <!-- add Ubuntu colors -->
+diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
+--- a/extras/Package_palettes.mk
++++ b/extras/Package_palettes.mk
+@@ -29,6 +29,7 @@ $(eval $(call gb_Package_add_files,extras_palettes,$(LIBO_SHARE_PRESETS_FOLDER)/
+ styles.sod \
+ tango.soc \
+ web.soc \
++ ubuntu.soc \
+ ))
+
+ # vim: set noet sw=4 ts=4:
+diff --git a/extras/source/palettes/ubuntu.soc b/extras/source/palettes/ubuntu.soc
+new file mode 100644
+--- /dev/null
++++ b/extras/source/palettes/ubuntu.soc
+@@ -0,0 +1,11 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<office:color-table xmlns:office="http://openoffice.org/2000/office"; xmlns:style="http://openoffice.org/2000/style"; xmlns:text="http://openoffice.org/2000/text"; xmlns:table="http://openoffice.org/2000/table"; xmlns:draw="http://openoffice.org/2000/drawing"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="http://openoffice.org/2000/meta"; xmlns:number="http://openoffice.org/2000/datastyle"; xmlns: [...]
++ <!-- Ubuntu palette -->
+ <draw:color draw:name="Ubuntu Orange" draw:color="#dd4814"/>
+ <draw:color draw:name="Ubuntu Warm Grey" draw:color="#aea79f"/>
+ <draw:color draw:name="Ubuntu Cool Grey" draw:color="#333333"/>
@@ -25,7 +35,7 @@ index a174401..eebc00d 100644
+ <draw:color draw:name="Ubuntu Mid Aubergine" draw:color="#5e2750"/>
+ <draw:color draw:name="Ubuntu Dark Aubergine" draw:color="#2c001e"/>
+ <draw:color draw:name="Canonical Aubergine" draw:color="#772953"/>
- </office:color-table>
++</office:color-table>
--
1.9.1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: