[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta1-2-287-g58523f8
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit 668633c6124828753dc4b15337e740faa29d08df
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Jun 7 23:39:24 2013 +0200
update patches
* unfuzz Ubuntu palette patch
* remove session installer for wizards -- they are all python now
diff --git a/changelog b/changelog
index c34d190..6b5103c 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,10 @@
libreoffice (1:4.1.0~beta2-0ubuntu1~ppa1) saucy; urgency=low
* new upstream beta
+ * unfuzz Ubuntu palette patch
+ * remove sessioninstaller for wizards patch -- they are all python now
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 07 Jun 2013 17:47:48 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 07 Jun 2013 23:38:18 +0200
libreoffice (1:4.1.0~beta2~git20130604-1) UNRELEASED; urgency=low
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 36e913a..207f1ff 100644
--- a/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
+++ b/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
@@ -11,10 +11,12 @@ diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standa
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"/>
+@@ -172,4 +172,13 @@
+ <draw:color draw:name="Chart 10" draw:color="#ff950e"/>
+ <draw:color draw:name="Chart 11" draw:color="#c5000b"/>
+ <draw:color draw:name="Chart 12" draw:color="#0084d1"/>
++
++ <!-- add Ubuntu colors -->
+ <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"/>
@@ -22,9 +24,7 @@ index f48577a..54e1ef8 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"/>
- <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"/>
+ </office:color-table>
--
1.7.9.5
diff --git a/patches/lp-780399-sessioninstaller-for-remaining-java-wizards.diff b/patches/lp-780399-sessioninstaller-for-remaining-java-wizards.diff
deleted file mode 100644
index 2fad617..0000000
--- a/patches/lp-780399-sessioninstaller-for-remaining-java-wizards.diff
+++ /dev/null
@@ -1,141 +0,0 @@
-From cbd105ea610f69e068b07f06a9d3a13d5d72305e Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-Date: Fri, 22 Feb 2013 15:08:26 +0100
-Subject: [PATCH] lp#780399: sessioninstaller for remaining java wizards
-
-Change-Id: Idbf4e24440f42f5b254cd1f4305f1cba729f33a6
----
- framework/source/dispatch/servicehandler.cxx | 34 ++++++++++++++++++++++++--
- svtools/inc/svtools/restartdialog.hxx | 5 +++-
- svtools/source/dialogs/restartdialog.cxx | 3 +++
- svtools/uiconfig/ui/restartdialog.ui | 14 +++++++++++
- 4 files changed, 53 insertions(+), 3 deletions(-)
-
-diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
-index 5bba096..5c0fe49 100644
---- a/framework/source/dispatch/servicehandler.cxx
-+++ b/framework/source/dispatch/servicehandler.cxx
-@@ -25,8 +25,11 @@
- #include <com/sun/star/frame/DispatchResultState.hpp>
- #include <com/sun/star/task/XJobExecutor.hpp>
-
-+#include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
-+#include <svtools/restartdialog.hxx>
- #include <vcl/svapp.hxx>
-
-+
- namespace framework{
-
- #define PROTOCOL_VALUE "service:"
-@@ -215,6 +218,7 @@ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL&
- css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( const css::util::URL& aURL ,
- const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ ) throw( css::uno::RuntimeException )
- {
-+
- /* SAFE */
- ReadGuard aReadLock( m_aLock );
- css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = m_xFactory;
-@@ -244,7 +248,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
-
- if (sServiceName.isEmpty())
- return css::uno::Reference< css::uno::XInterface >();
--
-+ SAL_INFO("framework.servicehandler", "service name: " << sServiceName);
- // If a service doesnt support an optional job executor interface - he can't get
- // any given parameters!
- // Because we can't know if we must call createInstanceWithArguments() or XJobExecutor::trigger() ...
-@@ -263,7 +267,33 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
- // E.g. a script based service (written in phyton) could not be executed
- // because it contains syntax errors, which was detected at runtime ...
- catch(const css::uno::Exception&)
-- { xService.clear(); }
-+ {
-+ SAL_INFO("framework.servicehandler", "caught exception for service name: " << sServiceName);
-+ if(sServiceName.startsWith("com.sun.star.wizards."))
-+ {
-+ SAL_INFO("framework.servicehandler", "this is a wizard");
-+ try
-+ {
-+ using namespace org::freedesktop::PackageKit;
-+ using namespace com::sun::star::uno;
-+ using namespace com::sun::star::lang;
-+ using namespace svtools;
-+ Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext()));
-+ Sequence< ::rtl::OUString > vPackages(1);
-+ vPackages[0] = "libreoffice-java-common";
-+ ::rtl::OUString sInteraction;
-+ xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, sInteraction);
-+ executeRestartDialog(comphelper::getProcessComponentContext(), NULL, RESTART_REASON_JAVAWIZARDS_INSTALL);
-+ }
-+ catch (const css::uno::Exception & e)
-+ {
-+ SAL_INFO(
-+ "framework.dispatch",
-+ "trying to install LibreOffice Java, caught " << e.Message);
-+ }
-+ }
-+ xService.clear();
-+ }
-
- return xService;
- }
-diff --git a/svtools/inc/svtools/restartdialog.hxx b/svtools/inc/svtools/restartdialog.hxx
-index 993b099..d1a7e97 100644
---- a/svtools/inc/svtools/restartdialog.hxx
-+++ b/svtools/inc/svtools/restartdialog.hxx
-@@ -29,9 +29,12 @@ enum RestartReason {
- RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT,
- // For the modified default print job format to take effect,
- // %PRODUCTNAME must be restarted.
-- RESTART_REASON_BIBLIOGRAPHY_INSTALL
-+ RESTART_REASON_BIBLIOGRAPHY_INSTALL,
- // "For the bibliography to work properly,
- // %PRODUCTNAME must be restarted."
-+ RESTART_REASON_JAVAWIZARDS_INSTALL,
-+ // "For the wizards to work properly,
-+ // %PRODUCTNAME must be restarted."
- };
-
- // Must be called with the solar mutex locked:
-diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx
-index e5d64de..a2c485c 100644
---- a/svtools/source/dialogs/restartdialog.cxx
-+++ b/svtools/source/dialogs/restartdialog.cxx
-@@ -40,6 +40,9 @@ public:
- case svtools::RESTART_REASON_BIBLIOGRAPHY_INSTALL:
- get(reason_, "reason_bibliography_install");
- break;
-+ case svtools::RESTART_REASON_JAVAWIZARDS_INSTALL:
-+ get(reason_, "reason_javawizards_install");
-+ break;
- default:
- assert(false); // this cannot happen
- }
-diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui
-index 624053e..febba5a 100644
---- a/svtools/uiconfig/ui/restartdialog.ui
-+++ b/svtools/uiconfig/ui/restartdialog.ui
-@@ -117,6 +117,20 @@
- <property name="position">3</property>
- </packing>
- </child>
-+ <child>
-+ <object class="GtkLabel" id="reason_javawizards_install">
-+ <property name="can_focus">False</property>
-+ <property name="no_show_all">True</property>
-+ <property name="label" translatable="yes">For the wizards to work properly, %PRODUCTNAME must be restarted.</property>
-+ <property name="wrap">True</property>
-+ <property name="max_width_chars">50</property>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="fill">True</property>
-+ <property name="position">4</property>
-+ </packing>
-+ </child>
- </object>
- <packing>
- <property name="expand">False</property>
---
-1.7.10.4
-
diff --git a/patches/series b/patches/series
index 3a8620c..62e2777 100644
--- a/patches/series
+++ b/patches/series
@@ -30,4 +30,3 @@ disable-sw_python.diff
javadoc-optional.diff
show-the-startcenter.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
-lp-780399-sessioninstaller-for-remaining-java-wizards.diff
--
LibreOffice packaging repository
Reply to: