------------------------------------------------------------
revno: 2359
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Thu 2011-02-03 00:46:19 +0100
message:
s/OpenOffice.org Plug-in/LibreOffice Plug-in/g
added:
patches/nsplugin-LibreOffice.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2011-01-30 17:07:42 +0000
+++ b/changelog 2011-02-02 23:46:19 +0000
@@ -2,6 +2,8 @@
* debian/patches/fixed-close-parentheses-with-icu-4.4.diff: add fix for
closing parantheses with icu >= 4.4 from fdo#32171 (closes: #601078)
+ * debian/patches/nsplugin-LibreOffice.diff:
+ s/OpenOffice.org Plug-in/LibreOffice Plug-in/g
* debian/rules:
- fix parallel=n handling to also work if parallel=N is not the first or
@@ -17,7 +19,7 @@
- update to look after the binaries in stable/, not src, as that version
is different
- -- Rene Engelhard <r...@debian.org> Sun, 30 Jan 2011 18:06:48 +0100
+ -- Rene Engelhard <r...@debian.org> Thu, 03 Feb 2011 00:44:46 +0100
libreoffice (1:3.3.0-1) experimental; urgency=low
=== added file 'patches/nsplugin-LibreOffice.diff'
--- a/patches/nsplugin-LibreOffice.diff 1970-01-01 00:00:00 +0000
+++ b/patches/nsplugin-LibreOffice.diff 2011-02-02 23:46:19 +0000
@@ -0,0 +1,31 @@
+--- /dev/null 2011-01-31 20:18:12.949141037 +0100
++++
libreoffice-3.3.0/libreoffice-build/patches/dev300/nsplugin-LibreOffice.diff
2011-02-03 00:39:03.000000000 +0100
+@@ -0,0 +1,19 @@
++From 13519789cd6c9f86067251c5566f29a96bdaac44 Mon Sep 17 00:00:00 2001
++From: Rene Engelhard <r...@debian.org>
++Date: Wed, 02 Feb 2011 23:37:15 +0000
++Subject: another s/OpenOffice.org/LibreOffice/ in nsplugin
++
++---
++diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc
b/extensions/source/nsplugin/source/nsplugin_oo.rc
++index 42a2a64..9d30de3 100644
++--- extensions/source/nsplugin/source/nsplugin_oo.rc
+++++ extensions/source/nsplugin/source/nsplugin_oo.rc
++@@ -26,5 +26,5 @@
++ ************************************************************************/
++ #define ADDITIONAL_VERINFO1 value "FileExtents",
"sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
++ value "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw
3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 -
5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 -
5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet
Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice
6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7
Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master
Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument
Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument
Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument
Drawing Template|OpenDocument Presentation|OpenDocument Presentation
Template|OpenDocument Formula\0"
++-#define ADDITIONAL_VERINFO2 value "FileDescription", "OpenOffice.org
Plug-in handles all its documents" value "ProductName", "OpenOffice.org
Plug-in" value "MIMEType",
"application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
+++#define ADDITIONAL_VERINFO2 value "FileDescription", "LibreOffice Plug-in
handles all its documents" value "ProductName", "LibreOffice Plug-in" value
"MIMEType",
"application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
++ #define ADDITIONAL_VERINFO3
"application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0"
++--
++cgit v0.8.3-6-g21f6
+--- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply-old
2011-02-03 00:42:30.000000000 +0100
++++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply 2011-02-03
00:43:13.000000000 +0100
+@@ -2390,3 +2390,6 @@
+
+ [ TemporaryHacks ]
+ hack-no-rm-fr-of-smoketest-userconfig.diff
++
++[ Fixes ]
++nsplugin-LibreOffice.diff
=== modified file 'patches/series'
--- a/patches/series 2011-01-26 02:35:28 +0000
+++ b/patches/series 2011-02-02 23:46:19 +0000
@@ -7,3 +7,4 @@
bridges-mkstemp-error-better-message.diff
pyuno-demo-fix-PYTHONPATH.diff
fixed-close-parentheses-with-icu-4.4.diff
+nsplugin-LibreOffice.diff
