The following commit has been merged in the master branch:
commit aba79719441ebcc079d8dcafe66de83b4f3db030
Author: Rene Engelhard <r...@debian.org>
Date: Thu Jul 21 16:26:37 2011 +0000
fix mising depends in bridges' build.lst which can cause FTBFS on s390(x),
arm, ia64, hppa, alpha
diff --git a/changelog b/changelog
index f41df12..3df01aa 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,8 @@
-libreoffice (1:3.3.3-5) UNRELEASED; urgency=low
+libreoffice (1:3.4.1-2) experimental; urgency=low
* debian/patches/update-debian-opt.diff: call dpkg-buildflags correctly
+ * debian/patches/fix-bridges-cpp-uno-depends.diff: fix mising depends in
+ bridges' build.lst which can cause FTBFS on s390(x), arm, ia64, hppa, alpha
* debian/changelog: mention VU#953183/CVE-2011-2685 in 1:3.3.3-1
* debian/control.in:
diff --git a/patches/fix-bridges-cpp-uno-depends.diff
b/patches/fix-bridges-cpp-uno-depends.diff
new file mode 100644
index 0000000..1f2b3bd
--- /dev/null
+++ b/patches/fix-bridges-cpp-uno-depends.diff
@@ -0,0 +1,27 @@
+--- /dev/null 2011-07-16 21:04:31.031883505 +0200
++++
libreoffice-3.4.1/libreoffice-build/patches/hotfixes/fix-bridges-cpp-uno-depends.diff
2011-07-21 18:21:10.000000000 +0200
+@@ -0,0 +1,24 @@
++diff --git a/bridges/prj/build.lst b/bridges/prj/build.lst
++index 9c7b2f3..69b51bf 100644
++--- bridges/prj/build.lst
+++++ bridges/prj/build.lst
++@@ -13,13 +13,13 @@ br bridges\source\cpp_uno\gcc3_aix_powerpc nmake
- u br_gcc3ap br_cppuno_shared
++ br bridges\source\cpp_uno\gcc3_linux_powerpc64 nmake - u
br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
++ br bridges\source\cpp_uno\gcc3_linux_mips nmake - u
br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
++ br bridges\source\cpp_uno\gcc3_linux_m68k nmake - u
br_gcc3lm68k br_cppuno_shared br_unotypes br_inc NULL
++-br bridges\source\cpp_uno\gcc3_linux_s390 nmake - u
br_gcc3l3 br_unotypes br_inc NULL
++-br bridges\source\cpp_uno\gcc3_linux_s390x nmake - u
br_gcc3l3_64 br_unotypes br_inc NULL
+++br bridges\source\cpp_uno\gcc3_linux_s390 nmake - u
br_gcc3l3 br_unotypes br_cppuno_shared br_inc NULL
+++br bridges\source\cpp_uno\gcc3_linux_s390x nmake - u
br_gcc3l3_64 br_unotypes br_cppuno_shared br_inc NULL
++ br bridges\source\cpp_uno\gcc3_linux_sparc nmake - u
br_gcc3ls br_unotypes br_cppuno_shared br_inc NULL
++-br bridges\source\cpp_uno\gcc3_linux_arm nmake - u
br_gcc3lr br_unotypes NULL
++-br bridges\source\cpp_uno\gcc3_linux_ia64 nmake - u
br_gcc3la br_unotypes NULL
++-br bridges\source\cpp_uno\gcc3_linux_hppa nmake - u
br_gcc3lh br_unotypes NULL
++-br bridges\source\cpp_uno\gcc3_linux_alpha nmake - u
br_gcc3ll br_unotypes NULL
+++br bridges\source\cpp_uno\gcc3_linux_arm nmake - u
br_gcc3lr br_unotypes br_cppuno_shared br_inc NULL
+++br bridges\source\cpp_uno\gcc3_linux_ia64 nmake - u
br_gcc3la br_unotypes br_cppuno_shared br_inc NULL
+++br bridges\source\cpp_uno\gcc3_linux_hppa nmake - u
br_gcc3lh br_unotypes br_cppuno_shared br_inc NULL
+++br bridges\source\cpp_uno\gcc3_linux_alpha nmake - u
br_gcc3ll br_unotypes br_cppuno_shared br_inc NULL
++ br bridges\source\cpp_uno\gcc3_macosx_intel nmake
- u br_gcc3macoxi br_cppuno_shared br_unotypes br_inc NULL
++ br bridges\source\cpp_uno\gcc3_macosx_powerpc nmake
- u br_gcc3macoxp br_cppuno_shared br_unotypes br_inc NULL
++ br bridges\source\cpp_uno\cc50_solaris_sparc nmake
- u br_cc50sols br_unotypes br_cppuno_shared br_inc NULL
diff --git a/patches/series b/patches/series
index aff39ae..e4558c5 100644
--- a/patches/series
+++ b/patches/series
@@ -17,3 +17,8 @@ disable-rhino.diff
bsh-hardcode-path.diff
mips-openjdk-jre-paths.diff
libebook-1.2.so.11.diff
+<<<<<<< HEAD
+=======
+vbaobj-visibility-fix.diff
+fix-bridges-cpp-uno-depends.diff
+>>>>>>> 9e2eb55... fix mising depends in bridges' build.lst which can cause
FTBFS on s390(x), arm, ia64, hppa, alpha
--
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/e1qk912-0003aq...@vasks.debian.org
