The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit f292f590cdb3358bbf1a74ed3dc409ea611e7217
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Thu Aug 25 00:41:28 2011 +0200
split ubuntu patch queues by new OneGit repos
diff --git a/patches/series b/patches/series
index a34af10..a0ce9db 100644
--- a/patches/series
+++ b/patches/series
@@ -21,5 +21,6 @@ make-gengal-work-again.diff
fix-distro-config.diff
fdo35784.diff
sdbc-postgresql-obsolete-hash-map.diff
-ubuntufixes.diff
+ubuntufixes-core.diff
+ubuntufixes-binfilter.diff
fix-libreoffice-build-configure-in.diff
diff --git a/patches/ubuntufixes-binfilter.diff
b/patches/ubuntufixes-binfilter.diff
new file mode 100644
index 0000000..cf4eb1d
--- /dev/null
+++ b/patches/ubuntufixes-binfilter.diff
@@ -0,0 +1,37 @@
+Index:
libreoffice-3.4.1/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
+@@ -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
++From: Bjoern Michaelsen <bjoern.michael...@canonical.com>
++Date: Fri, 8 Jul 2011 11:04:50 +0200
++Subject: [PATCH] another fix for --as-needed
++
++---
++ binfilter/filter/source/bf_offwrp/makefile.mk | 2 +-
++ 1 files changed, 1 insertions(+), 1 deletions(-)
++
++diff --git a/binfilter/filter/source/bf_offwrp/makefile.mk
b/binfilter/filter/source/bf_offwrp/makefile.mk
++index d65beed..0545931 100644
++--- binfilter/filter/source/bf_offwrp/makefile.mk
+++++ binfilter/filter/source/bf_offwrp/makefile.mk
++@@ -52,7 +52,6 @@ SHL1STDLIBS= \
++ $(BFSVTOOLLIB) \
++ $(BFOFALIB) \
++ $(VCLLIB) \
++- $(SOTLIB) \
++ $(SALLIB) \
++ $(TOOLSLIB) \
++ $(CPPULIB) \
++@@ -64,6 +63,7 @@ SHL1STDLIBS= \
++ $(BFSCLIB) \
++ $(BFSVXLIB) \
++ $(BFSO3LIB) \
+++ $(SOTLIB) \
++ $(UNOTOOLSLIB) \
++ $(COMPHELPERLIB) \
++ $(LEGACYSMGRLIB)
++--
++1.7.5.4
diff --git a/patches/ubuntufixes.diff b/patches/ubuntufixes-core.diff
similarity index 97%
rename from patches/ubuntufixes.diff
rename to patches/ubuntufixes-core.diff
index 3612115..d80c96e 100644
--- a/patches/ubuntufixes.diff
+++ b/patches/ubuntufixes-core.diff
@@ -1,8 +1,8 @@
-Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+Index:
libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
2011-07-26 13:30:15.400961946 +0200
-@@ -0,0 +1,1124 @@
++++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff
2011-07-26 13:30:15.400961946 +0200
+@@ -0,0 +1,1092 @@
+./g format-patch libreoffice-3-4-0..libreoffice-3-4-0-ubuntu --stdout |sed
-e 's|^--- a/|--- |' -e 's|^+++ b/|+++ |'
+===== main repo =====
+From c8b0c9ab769ca586407a49578f251e3aaa1b7ead Mon Sep 17 00:00:00 2001
@@ -280,39 +280,6 @@ Index:
libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+--
+1.7.5.4
+
-+===== filters =====
-+From 2fa6a8fb2de3ae6ddd5a9f862139f69f4be67c04 Mon Sep 17 00:00:00 2001
-+From: Bjoern Michaelsen <bjoern.michael...@canonical.com>
-+Date: Fri, 8 Jul 2011 11:04:50 +0200
-+Subject: [PATCH] another fix for --as-needed
-+
-+---
-+ binfilter/filter/source/bf_offwrp/makefile.mk | 2 +-
-+ 1 files changed, 1 insertions(+), 1 deletions(-)
-+
-+diff --git a/binfilter/filter/source/bf_offwrp/makefile.mk
b/binfilter/filter/source/bf_offwrp/makefile.mk
-+index d65beed..0545931 100644
-+--- binfilter/filter/source/bf_offwrp/makefile.mk
-++++ binfilter/filter/source/bf_offwrp/makefile.mk
-+@@ -52,7 +52,6 @@ SHL1STDLIBS= \
-+ $(BFSVTOOLLIB) \
-+ $(BFOFALIB) \
-+ $(VCLLIB) \
-+- $(SOTLIB) \
-+ $(SALLIB) \
-+ $(TOOLSLIB) \
-+ $(CPPULIB) \
-+@@ -64,6 +63,7 @@ SHL1STDLIBS= \
-+ $(BFSCLIB) \
-+ $(BFSVXLIB) \
-+ $(BFSO3LIB) \
-++ $(SOTLIB) \
-+ $(UNOTOOLSLIB) \
-+ $(COMPHELPERLIB) \
-+ $(LEGACYSMGRLIB)
-+--
-+1.7.5.4
-+
+===== help =====
+===== impress =====
+===== libs-core =====
--
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/e1qwnqb-0007i7...@vasks.debian.org
