[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.2-2-184-g437cff4
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 437cff46141d15ea06962993e1ff084307dc8f3e
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Aug 26 10:25:44 2011 +0200
remove accidentally commited file
diff --git a/patches/series.orig b/patches/series.orig
deleted file mode 100644
index d326b0c..0000000
--- a/patches/series.orig
+++ /dev/null
@@ -1,29 +0,0 @@
-splash-progressbarcolor.diff
-buildfix-patches.diff
-no-minimaltoc.diff
-update-debian-opt.diff
-gcc4.6.0.diff
-odk-jni-include.diff
-disable-ooinstall-in-package-ooo.diff
-jurt-soffice-location.diff
-packcomponents-remove-split-components.diff
-debian-debug.diff
-disable-rhino.diff
-bsh-hardcode-path.diff
-mips-openjdk-jre-paths.diff
-autogen.diff
-disable-dynamic-list-cpp.diff
-libebook-1.2.so.11.diff
-vbaobj-visibility-fix.diff
-fix-bridges-cpp-uno-depends.diff
-no-prctl-on-kfreebsd.diff
-<<<<<<< HEAD
-ubuntufixes.diff
-libreoffice-build-161a3f9f2229675e083e0806e8171cb0b3145168.diff
-fix-libreoffice-build-configure-in.diff
-=======
-make-gengal-work-again.diff
-fix-distro-config.diff
-fdo35784.diff
-sdbc-postgresql-obsolete-hash-map.diff
->>>>>>> debian-experimental-3.4.0
--
LibreOffice packaging repository
Reply to: