[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.2-2-170-g3956dc8
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 3956dc802bc9f1d40de3d02bbe253614314cd730
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Aug 25 01:59:25 2011 +0200
regenerate patch queue
diff --git a/patches/fix-libreoffice-build-configure-in.diff b/patches/fix-libreoffice-build-configure-in.diff
index 8bcdd14..610fc8b 100644
--- a/patches/fix-libreoffice-build-configure-in.diff
+++ b/patches/fix-libreoffice-build-configure-in.diff
@@ -1,7 +1,7 @@
-Index: libreoffice-3.4.1/libreoffice-build/configure
+Index: libreoffice-3.4.2/libreoffice-build/configure
===================================================================
---- libreoffice-3.4.1.orig/libreoffice-build/configure 2011-07-18 11:56:23.836480512 +0200
-+++ libreoffice-3.4.1/libreoffice-build/configure 2011-07-18 11:56:23.916480517 +0200
+--- libreoffice-3.4.2.orig/libreoffice-build/configure 2011-08-25 01:57:25.593666465 +0200
++++ libreoffice-3.4.2/libreoffice-build/configure 2011-08-25 01:58:01.233666195 +0200
@@ -7178,7 +7178,7 @@
ac_config_files="$ac_config_files intltool-extract intltool-merge intltool-update"
@@ -19,10 +19,10 @@ Index: libreoffice-3.4.1/libreoffice-build/configure
"src/helpcontent2/Makefile") CONFIG_FILES="$CONFIG_FILES src/helpcontent2/Makefile" ;;
"src/icons/Makefile") CONFIG_FILES="$CONFIG_FILES src/icons/Makefile" ;;
"src/icons/tango/Makefile") CONFIG_FILES="$CONFIG_FILES src/icons/tango/Makefile" ;;
-Index: libreoffice-3.4.1/libreoffice-build/configure.in
+Index: libreoffice-3.4.2/libreoffice-build/configure.in
===================================================================
---- libreoffice-3.4.1.orig/libreoffice-build/configure.in 2011-07-06 15:39:49.000000000 +0200
-+++ libreoffice-3.4.1/libreoffice-build/configure.in 2011-07-18 11:56:23.916480517 +0200
+--- libreoffice-3.4.2.orig/libreoffice-build/configure.in 2011-08-25 01:54:21.243667855 +0200
++++ libreoffice-3.4.2/libreoffice-build/configure.in 2011-08-25 01:58:01.233666195 +0200
@@ -1873,6 +1873,7 @@
po/Makefile
po/sdf-templates/Makefile
@@ -31,10 +31,10 @@ Index: libreoffice-3.4.1/libreoffice-build/configure.in
src/helpcontent2/Makefile
src/icons/Makefile
src/icons/tango/Makefile
-Index: libreoffice-3.4.1/libreoffice-build/src/Makefile.in
+Index: libreoffice-3.4.2/libreoffice-build/src/Makefile.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/src/Makefile.in 2011-07-18 11:56:23.916480517 +0200
++++ libreoffice-3.4.2/libreoffice-build/src/Makefile.in 2011-08-25 01:58:01.243666196 +0200
@@ -0,0 +1,682 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
diff --git a/patches/ubuntufixes-binfilter.diff b/patches/ubuntufixes-binfilter.diff
index cf4eb1d..488d09e 100644
--- a/patches/ubuntufixes-binfilter.diff
+++ b/patches/ubuntufixes-binfilter.diff
@@ -1,7 +1,7 @@
-Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-binfilter.diff
+Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-binfilter.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-binfilter.diff 2011-07-26 13:30:15.400961946 +0200
++++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-binfilter.diff 2011-08-25 01:57:53.643666252 +0200
@@ -0,0 +1,32 @@
+./g format-patch libreoffice-3-4-0..libreoffice-3-4-0-ubuntu --stdout |sed -e 's|^--- a/|--- |' -e 's|^+++ b/|+++ |'
+From 2fa6a8fb2de3ae6ddd5a9f862139f69f4be67c04 Mon Sep 17 00:00:00 2001
diff --git a/patches/ubuntufixes-core.diff b/patches/ubuntufixes-core.diff
index 422ca27..b774b66 100644
--- a/patches/ubuntufixes-core.diff
+++ b/patches/ubuntufixes-core.diff
@@ -1,5 +1,7 @@
---- /dev/null 2011-08-22 10:02:39.668246905 +0200
-+++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff 2011-08-25 01:14:13.323686027 +0200
+Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff 2011-08-25 01:57:42.923666333 +0200
@@ -0,0 +1,1068 @@
+git format-patch --stdout libreoffice-3.4.2.3..distro/ubuntu/oneiric-3.4 |sed -e 's|^--- a/|--- |' -e 's|^+++ b/|+++ |'
+From 199bcf985154d33b534d87d1c96c48cbc74a0427 Mon Sep 17 00:00:00 2001
--
LibreOffice packaging repository
Reply to: