[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-103-g185b001
The following commit has been merged in the debian-experimental-3.5 branch:
commit 185b0011fd825425c72af8a3be877ba4c99490a4
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Nov 24 17:12:24 2011 +0100
migrate help-msg-add-package-info.diff from libreoffice/build, replace openoffice.org with libreoffice
diff --git a/changelog b/changelog
index 6a60665..cc2729e 100644
--- a/changelog
+++ b/changelog
@@ -30,8 +30,11 @@ libreoffice (1:3.5.0~alpha0~git20111121-1) UNRELEASED; urgency=low
* update most outdated README sections
* build needs the ext-sources
* migrate mention-java-common-package.diff from libreoffice/build
+ * migrate help-msg-add-package-info.diff from libreoffice/build
+ * update help-msg-add-package-info.diff, replace openoffice.org with
+ libreoffice
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 24 Nov 2011 15:45:03 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 24 Nov 2011 17:05:29 +0100
libreoffice (1:3.4.4-2) UNRELEASED; urgency=medium
diff --git a/patches/help-msg-add-package-info.diff b/patches/help-msg-add-package-info.diff
new file mode 100644
index 0000000..3684719
--- /dev/null
+++ b/patches/help-msg-add-package-info.diff
@@ -0,0 +1,13 @@
+Index: logit/sfx2/source/appl/sfxhelp.cxx
+===================================================================
+--- logit.orig/sfx2/source/appl/sfxhelp.cxx 2011-11-22 20:57:46.000000000 +0000
++++ logit/sfx2/source/appl/sfxhelp.cxx 2011-11-24 16:03:16.084114498 +0000
+@@ -104,7 +104,7 @@
+
+ NoHelpErrorBox::NoHelpErrorBox( Window* _pParent ) :
+
+- ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPFILENOTEXIST ) ) )
++ ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPFILENOTEXIST ) ).Append(String(DEFINE_CONST_UNICODE(".\nPlease install the libreoffice-help-en-us package or the locale specific help package libreoffice-help-<language-code>."))) )
+ {
+ // Error message: "No help available"
+ }
diff --git a/patches/series b/patches/series
index e374404..474556a 100644
--- a/patches/series
+++ b/patches/series
@@ -15,3 +15,4 @@ cleanup-distro-install-file-lists.diff
smoketest-only-en-US.diff
getMIMEDescription-mismatch.diff
mention-java-common-package.diff
+help-msg-add-package-info.diff
--
LibreOffice packaging repository
Reply to: