[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-143-g4d4f4d6



The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit cd677597ebc545f69a3f75721e7f9b78193a1f66
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Fri Apr 20 09:32:32 2012 +0200

    lp#753627: readd updated Ubuntu brand palette colors

diff --git a/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff b/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
new file mode 100644
index 0000000..36e913a
--- /dev/null
+++ b/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
@@ -0,0 +1,30 @@
+From c57a2bcb471abee33365b410caa7c413fc3a0c00 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Fri, 20 Apr 2012 09:27:39 +0200
+Subject: [PATCH] lp#753627: readd updated Ubuntu brand palette colors
+
+---
+ extras/source/palettes/standard.soc |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc
+index f48577a..54e1ef8 100644
+--- a/extras/source/palettes/standard.soc
++++ b/extras/source/palettes/standard.soc
+@@ -24,6 +24,13 @@
+   <draw:color draw:name="Gray 20%" draw:color="#cccccc"/>
+   <draw:color draw:name="Gray 10%" draw:color="#e6e6e6"/>
+   <draw:color draw:name="Blue gray" draw:color="#e6e6ff"/>
++  <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"/>
++  <draw:color draw:name="Ubuntu Light Aubergine" draw:color="#77216f"/>
++  <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"/>
+   <draw:color draw:name="Red 1" draw:color="#ff3366"/>
+   <draw:color draw:name="Red 2" draw:color="#dc2300"/>
+   <draw:color draw:name="Red 3" draw:color="#b84700"/>
+-- 
+1.7.9.5
+
diff --git a/patches/series b/patches/series
index b21ae19..6bccec6 100644
--- a/patches/series
+++ b/patches/series
@@ -28,3 +28,4 @@ build-dont-run-checks.diff
 #lp-904212-add-missing-mimetypes-to-impress.desktop.diff
 disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
 disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
+lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff

-- 
LibreOffice packaging repository


Reply to: