[libreoffice] 02/06: actually update help-msg-add-package-info.diff/mention-java-common-package.diff and re-enable...
Rene Engelhard
rene at moszumanska.debian.org
Wed Mar 29 11:32:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit 0f54574649401b43130f74f38317b5c9122ddf09
Author: Rene Engelhard <rene at debian.org>
Date: Mon Mar 27 15:04:22 2017 +0200
actually update help-msg-add-package-info.diff/mention-java-common-package.diff and re-enable...
---
changelog | 6 ++-
patches/help-msg-add-package-info.diff | 22 ++++-----
patches/mention-java-common-package.diff | 83 +++++++++++++-------------------
patches/series | 4 +-
4 files changed, 52 insertions(+), 63 deletions(-)
diff --git a/changelog b/changelog
index 8b198a7..fa5ce04 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,10 @@ libreoffice (1:5.3.2~rc1-1) UNRELEASED; urgency=medium
* New upstream release candidate
+ * debian/patches/help-msg-add-package-info.diff,
+ debian/patches/mention-java-common-package.diff,
+ debian/patches/series: actually update the patches and re-enable...
+
* debian/rules:
- move /usr/include/libreoffice/sal/typesizes.h symlink to -dev
instead of -dev-common (closes: #858199)
@@ -11,7 +15,7 @@ libreoffice (1:5.3.2~rc1-1) UNRELEASED; urgency=medium
- add missing JRE depends
(thanks to Daniel Richard G. for those two, see #858655)
- -- Rene Engelhard <rene at debian.org> Sun, 26 Mar 2017 00:47:55 +0100
+ -- Rene Engelhard <rene at debian.org> Mon, 27 Mar 2017 15:03:46 +0200
libreoffice (1:5.3.1-1) experimental; urgency=medium
diff --git a/patches/help-msg-add-package-info.diff b/patches/help-msg-add-package-info.diff
index 3684719..3f37be7 100644
--- a/patches/help-msg-add-package-info.diff
+++ b/patches/help-msg-add-package-info.diff
@@ -1,13 +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 @@
+diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
+index 21c5f9175f2e..cbd28e5b538b 100644
+--- a/sfx2/source/appl/app.src
++++ b/sfx2/source/appl/app.src
+@@ -220,7 +220,7 @@ String RID_STR_NOAUTOSTARTHELPAGENT
- 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>."))) )
+ String RID_STR_HLPFILENOTEXIST
{
- // Error message: "No help available"
- }
+- Text [ en-US ] = "The help file for this topic is not installed." ;
++ Text [ en-US ] = "The help file for this topic is not installed. Please install the libreoffice-help-en-us package or the locale specific help package libreoffice-help-<language-code>." ;
+ };
+
+ String STR_QUICKSTART_EXIT
diff --git a/patches/mention-java-common-package.diff b/patches/mention-java-common-package.diff
index 0d3f1a4..eea754e 100644
--- a/patches/mention-java-common-package.diff
+++ b/patches/mention-java-common-package.diff
@@ -1,60 +1,45 @@
-Index: logit/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
-===================================================================
---- logit.orig/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 2011-11-22 20:57:46.000000000 +0000
-+++ logit/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 2011-11-24 14:35:39.204393946 +0000
-@@ -172,6 +172,9 @@
+diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+index 718902caba6f..3c8499b5a42c 100644
+--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
++++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+@@ -141,6 +141,9 @@ static bool findAndSelect(JavaInfo ** ppInfo)
if (errcode == JFW_E_NO_JAVA_FOUND)
{
- fprintf(stderr,"javaldx: Could not find a Java Runtime Environment! \n");
+ fprintf(stderr,"javaldx: Could not find a Java Runtime Environment!\n");
+ fprintf(stderr,"Please ensure that a JVM and the package libreoffice-java-common\n");
+ fprintf(stderr,"is installed.\n");
+ fprintf(stderr,"If it is already installed then try removing ~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n");
return false;
}
else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)
-Index: logit/svtools/source/java/javainteractionhandler.cxx
-===================================================================
---- logit.orig/svtools/source/java/javainteractionhandler.cxx 2011-11-22 20:57:46.000000000 +0000
-+++ logit/svtools/source/java/javainteractionhandler.cxx 2011-11-24 14:42:13.836371593 +0000
-@@ -52,9 +52,10 @@
- #include <svtools/javainteractionhandler.hxx>
- #include <svtools/javacontext.hxx>
+diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src
+index 60d7c720ebeb..588f034f1f74 100644
+--- a/svtools/source/java/javaerror.src
++++ b/svtools/source/java/javaerror.src
+@@ -21,7 +21,7 @@
-+#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
-+
- using namespace com::sun::star::uno;
- using namespace com::sun::star::task;
--
- namespace svt
+ String STR_WARNING_JAVANOTFOUND
{
+- Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.";
++ Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE (and libreoffice-java-common) and restart %PRODUCTNAME.";
+ };
-@@ -158,6 +158,9 @@
- #endif
- String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS));
- aWarningBox.SetText( aTitle );
-+ String aText = String(aWarningBox.GetMessText());
-+ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality."));
-+ aWarningBox.SetMessText( aText );
- nResult = aWarningBox.Execute();
- }
- else
-@@ -173,6 +177,9 @@
- QueryBox aQueryBox( NULL, SvtResId( QBX_JAVADISABLED ) );
- String aTitle( SvtResId( STR_QUESTION_JAVADISABLED ) );
- aQueryBox.SetText( aTitle );
-+ String aText = String(aQueryBox.GetMessText());
-+ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality."));
-+ aQueryBox.SetMessText( aText );
- nResult = aQueryBox.Execute();
- if ( nResult == RET_YES )
- {
-@@ -215,6 +222,9 @@
- ErrorBox aErrorBox(NULL, SvtResId( ERRORBOX_RESTARTREQUIRED ) );
- String aTitle( SvtResId( STR_ERROR_RESTARTREQUIRED ) );
- aErrorBox.SetText( aTitle );
-+ String aText = String(aErrorBox.GetMessText());
-+ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the libreoffice-java-common package for this functionality."));
-+ aErrorBox.SetMessText( aText );
- nResult = aErrorBox.Execute();
- }
- else
+ String STR_WARNING_JAVANOTFOUND_MAC
+@@ -36,7 +36,7 @@ String STR_WARNING_INVALIDJAVASETTINGS_MAC
+
+ String STR_WARNING_INVALIDJAVASETTINGS
+ {
+- Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.";
++ Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME. Maybe you also need to install libreoffice-java-common";
+ };
+
+ String STR_ERROR_JVMCREATIONFAILED_MAC
+@@ -46,7 +46,7 @@ String STR_ERROR_JVMCREATIONFAILED_MAC
+
+ String STR_ERROR_JVMCREATIONFAILED
+ {
+- Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced.";
++ Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced or install libreoffice-java-common if not already installed.";
+ };
+
+ String STR_WARNING_JAVANOTFOUND_TITLE
diff --git a/patches/series b/patches/series
index 15eb4aa..a413b0a 100644
--- a/patches/series
+++ b/patches/series
@@ -6,8 +6,8 @@ debian-debug.diff
#fix-system-lpsolve-build.diff
build-against-shared-lpsolve.diff
install-fixes.diff
-#mention-java-common-package.diff
-#help-msg-add-package-info.diff
+mention-java-common-package.diff
+help-msg-add-package-info.diff
sensible-lomua.diff
reportdesign-mention-package.diff
jdbc-driver-classpaths.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list