The following commit has been merged in the master branch: commit ed84027f5ae763bcaf2c842df607902724b38c11 Author: Rene Engelhard <r...@debian.org> Date: Fri Jul 1 09:16:18 2011 +0200
debian/patches/mips-openjdk-jre-paths.diff: oops, forgot JRELIBIR when porting the patch from gabrielli.. diff --git a/changelog b/changelog index f26d42a..045b0ec 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,12 @@ +libreoffice (1:3.3.3-3) unstable; urgency=low + + * brown paper pag release. + + * debian/patches/mips-openjdk-jre-paths.diff: oops, forgot JRELIBIR when + porting the patch from gabrielli.. + + -- Rene Engelhard <r...@debian.org> Thu, 30 Jun 2011 21:39:44 +0000 + libreoffice (1:3.3.3-2) unstable; urgency=low * debian/patches/scripting-bsh-no-envvar.diff, diff --git a/patches/mips-openjdk-jre-paths.diff b/patches/mips-openjdk-jre-paths.diff index 1c31206..55740c1 100644 --- a/patches/mips-openjdk-jre-paths.diff +++ b/patches/mips-openjdk-jre-paths.diff @@ -1,11 +1,12 @@ --- /dev/null 2011-06-27 20:29:01.643585831 +0200 +++ libreoffice-3.4.0/libreoffice-build/patches/dev300/mips-openjdk-jre-paths.diff 2011-06-28 16:06:31.000000000 +0200 -@@ -0,0 +1,17 @@ +@@ -0,0 +1,18 @@ +--- set_soenv.in-old 2011-06-28 16:05:08.000000000 +0200 ++++ set_soenv.in 2011-06-28 16:06:07.000000000 +0200 +@@ -651,11 +651,11 @@ + -+ $JRELIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH; ++- $JRELIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH; +++ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH; + if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" ) { +- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client"; # Lemote ++ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client"; # Lemote -- LibreOffice packaging repository -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1qcxwa-0003id...@vasks.debian.org