Bug#703602: unblock: libreoffice/3.5.4+dfsg2-1
Hi,
On Thu, Mar 21, 2013 at 10:56:24AM +0100, Rene Engelhard wrote:
> +diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlin
> +index af7ee26..c67db8c 100644
> +--- a/desktop/source/app/cmdlineargs.cxx
> ++++ b/desktop/source/app/cmdlineargs.cxx
> +@@ -217,7 +217,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier&
> + bStartEvent = false;
> + bDisplaySpec = false;
> + }
> +- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASC
> ++ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASC
> + {
> + // open in viewmode
> + bOpenEvent = false;
> +@@ -229,7 +229,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier&
> + bStartEvent = false;
> + bDisplaySpec = false;
> + }
> +- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASC
> ++ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASC
> + {
> + // open in viewmode
> + bOpenEvent = false;
> +--
> diff --git a/patches/odk-link-to-jdk-1.5-docs.diff b/patches/odk-link-to-jdk
> new file mode 100644
> index 0000000..0134a17
> --- /dev/null
> +++ b/patches/odk-link-to-jdk-1.5-docs.diff
> @@ -0,0 +1,11 @@
> +--- a/odk/pack/gendocu/makefile.mk-old 2013-02-13 18:27:44.906025467 +0100
> ++++ b/odk/pack/gendocu/makefile.mk 2013-02-13 18:28:14.770024586 +0100
> +@@ -77,7 +77,7 @@
> + -p salhelper $(INCOUT) -t salhelper \
> + -p bridges $(INCOUT) -t bridges
> +
> +-JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference"
> ++JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference"
> +
> + JAVADOCLOG = $(MISC)$/javadoc_log.txt
> +
Sigh. Obviously cut'n'pasting from git diff was a bad idea. git diff > diff
works better :).
Attached.
Regards,
Rene
diff --git a/changelog b/changelog
index 0ddb282..c8385db 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,20 @@
+libreoffice (1:3.5.4+dfsg2-1) unstable; urgency=low
+
+ * src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: remove
+ lib/servlet.jar..
+
+ * debian/patches/fix-view-option.diff: backport fix to fix --view
+ from libreoffice-3-6 (closes: #697723)
+ * debian/patches/odk-link-to-jdk-1.5-docs.diff: link to
+ http://java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ as the former
+ doesn't exist anymore
+
+ * debian/control.in:
+ - remove bogus | python3-uno dependency alternatives. Will properly be back
+ with LO 4.0 which supports python3
+
+ -- Rene Engelhard <rene@debian.org> Mon, 18 Mar 2013 22:39:11 +0100
+
libreoffice (1:3.5.4+dfsg-4) unstable; urgency=medium
* debian/control.in:
diff --git a/control b/control
index 527bf73..0f433a3 100644
--- a/control
+++ b/control
@@ -343,7 +343,7 @@ Description: office productivity suite -- GNOME integration
Package: libreoffice-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno | python3-uno, libreoffice-core, ${misc:Depends}
+Depends: ${python:Depends}, python-uno, libreoffice-core, ${misc:Depends}
Enhances: libreoffice-writer
Replaces: python-uno (<< 1:2.4.1-5)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@ -427,7 +427,7 @@ Description: office productivity suite -- legacy 1.0 XML DTD
Package: libreoffice-script-provider-python
Architecture: all
Section: python
-Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python-uno | python3-uno, ${misc:Depends}
+Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python-uno, ${misc:Depends}
Replaces: python-uno (<< 1:3.5.2-2), python3-uno (<< 1:3.5.2-2)
Conflicts: libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: Python script support provider for LibreOffice scripting framework
diff --git a/control.in b/control.in
index ede4f52..89deb68 100644
--- a/control.in
+++ b/control.in
@@ -483,7 +483,7 @@ Description: office productivity suite -- GNOME integration
Package: libreofficeVER-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno | python3-uno, libreofficeVER-core, ${misc:Depends}
+Depends: ${python:Depends}, python-uno, libreofficeVER-core, ${misc:Depends}
Enhances: libreofficeVER-writer
Replaces: python-uno (<< 1:2.4.1-5)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@ -582,7 +582,7 @@ Description: office productivity suite -- legacy 1.0 XML DTD
Package: libreoffice-script-provider-python
Architecture: all
Section: python
-Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python-uno | python3-uno, ${misc:Depends}
+Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python-uno, ${misc:Depends}
Replaces: python-uno (<< 1:3.5.2-2), python3-uno (<< 1:3.5.2-2)
Conflicts: libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: Python script support provider for LibreOffice scripting framework
diff --git a/libreoffice-presentation-minimizer.triggers.in b/libreoffice-presentation-minimizer.triggers.in
new file mode 100644
index 0000000..a7bc60e
--- /dev/null
+++ b/libreoffice-presentation-minimizer.triggers.in
@@ -0,0 +1 @@
+activate /@OODIR@/share/extensions
diff --git a/libreoffice-presenter-console.triggers.in b/libreoffice-presenter-console.triggers.in
new file mode 100644
index 0000000..a7bc60e
--- /dev/null
+++ b/libreoffice-presenter-console.triggers.in
@@ -0,0 +1 @@
+activate /@OODIR@/share/extensions
diff --git a/patches/fix-view-option.diff b/patches/fix-view-option.diff
new file mode 100644
index 0000000..7806be3
--- /dev/null
+++ b/patches/fix-view-option.diff
@@ -0,0 +1,33 @@
+From 4fc8af89257436b9cad70de574a166aa11ec42f1 Mon Sep 17 00:00:00 2001
+From: Caolán McNamara <caolanm@redhat.com>
+Date: Mon, 09 Jul 2012 11:51:16 +0000
+Subject: Resolves: rhbz#838368 --view ignored while -view accepted
+
+and our ooviewdoc script uses --view
+
+Change-Id: Ice708f1c72c8d29d411ba21e93cb19876af13881
+---
+diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
+index af7ee26..c67db8c 100644
+--- a/desktop/source/app/cmdlineargs.cxx
++++ b/desktop/source/app/cmdlineargs.cxx
+@@ -217,7 +217,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
+ bStartEvent = false;
+ bDisplaySpec = false;
+ }
+- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-view" )))
++ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "view" )))
+ {
+ // open in viewmode
+ bOpenEvent = false;
+@@ -229,7 +229,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
+ bStartEvent = false;
+ bDisplaySpec = false;
+ }
+- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-show" )))
++ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "show" )))
+ {
+ // open in viewmode
+ bOpenEvent = false;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/odk-link-to-jdk-1.5-docs.diff b/patches/odk-link-to-jdk-1.5-docs.diff
new file mode 100644
index 0000000..0134a17
--- /dev/null
+++ b/patches/odk-link-to-jdk-1.5-docs.diff
@@ -0,0 +1,11 @@
+--- a/odk/pack/gendocu/makefile.mk-old 2013-02-13 18:27:44.906025467 +0100
++++ b/odk/pack/gendocu/makefile.mk 2013-02-13 18:28:14.770024586 +0100
+@@ -77,7 +77,7 @@
+ -p salhelper $(INCOUT) -t salhelper \
+ -p bridges $(INCOUT) -t bridges
+
+-JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES)
++JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES)
+
+ JAVADOCLOG = $(MISC)$/javadoc_log.txt
+
diff --git a/patches/series b/patches/series
index 0ce7ee4..11403b0 100644
--- a/patches/series
+++ b/patches/series
@@ -49,3 +49,5 @@ CVE-2012-4233.diff
soffice-bashisms.diff
he-lucida-sans-unicode.diff
ure-no-etc-opt-ure.diff
+fix-view-option.diff
+odk-link-to-jdk-1.5-docs.diff
Reply to: