------------------------------------------------------------
revno: 2315
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Tue 2011-01-11 13:03:00 +0100
message:
fix -java-common message to say libreoffice, not openoffice.org
added:
patches/java-common-message-LibreOffice.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2011-01-10 21:18:35 +0000
+++ b/changelog 2011-01-11 12:03:00 +0000
@@ -2,6 +2,9 @@
* LibreOffice 3.3.0 rc3
+ * debian/patches/java-common-message-LibreOffice.diff: fix patched-in
+ java-common message to say libreoffice-java-common (closes: #609660)
+
* debian/rules
- bump SPI (c) upto 2011
- remove debian source package 1.0 format support, we don't
=== added file 'patches/java-common-message-LibreOffice.diff'
--- a/patches/java-common-message-LibreOffice.diff 1970-01-01 00:00:00
+0000
+++ b/patches/java-common-message-LibreOffice.diff 2011-01-11 12:03:00
+0000
@@ -0,0 +1,29 @@
+---
libreoffice-3.3/libreoffice-build/patches/dev300/ubuntu-openoffice-java-common.diff-old
2011-01-11 12:45:07.000000000 +0100
++++
libreoffice-3.3/libreoffice-build/patches/dev300/ubuntu-openoffice-java-common.diff
2011-01-11 12:45:40.000000000 +0100
+@@ -17,7 +17,7 @@
+
+ aWarningBox.SetText( aTitle );
+ + String aText = String(aWarningBox.GetMessText());
+-+ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the
openoffice.org-java-common package for this functionality."));
+++ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the
libreoffice-java-common package for this functionality."));
+ + aWarningBox.SetMessText( aText );
+ nResult = aWarningBox.Execute();
+
+@@ -27,7 +27,7 @@
+
+ aQueryBox.SetText( aTitle );
+ + String aText = String(aQueryBox.GetMessText());
+-+ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the
openoffice.org-java-common package for this functionality."));
+++ 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 )
+@@ -37,7 +37,7 @@
+
+ aErrorBox.SetText( aTitle );
+ + String aText = String(aErrorBox.GetMessText());
+-+ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the
openoffice.org-java-common package for this functionality."));
+++ aText.Append(DEFINE_CONST_UNICODE("\nPlease install the
libreoffice-java-common package for this functionality."));
+ + aErrorBox.SetMessText( aText );
+ nResult = aErrorBox.Execute();
+ }
=== modified file 'patches/series'
--- a/patches/series 2011-01-10 21:18:35 +0000
+++ b/patches/series 2011-01-11 12:03:00 +0000
@@ -4,3 +4,4 @@
hack-no-rm-fr-of-smoketest-userconfig.diff
do-not-switch-workspaces-of-wm.diff
fix-wrapper-manpage-install.diff
+java-common-message-LibreOffice.diff
