The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 1db2ab061138f13e1cbc2a42b1413a43a44962ae
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Tue Feb 22 01:55:47 2011 +0100
fixing patch paths
diff --git a/patches/human-icons-add.diff b/patches/human-icons-add.diff
index 2850f25..fa20b03 100644
--- a/patches/human-icons-add.diff
+++ b/patches/human-icons-add.diff
@@ -1,7 +1,5 @@
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index c47179f..f26c527 100755
---- a/patches/dev300/apply
-+++ b/patches/dev300/apply
+--- libreoffice/libreoffice-build/patches/dev300/apply
++++ libreoffice/libreoffice-build/patches/dev300/apply
@@ -1562,8 +1562,7 @@ ubuntu-palette.diff
#ubuntu-lpi-help-translate.diff, i#64895, mklose
#ubuntu-lpi-bugs.diff, i#64895, mklose
@@ -12,16 +10,11 @@ index c47179f..f26c527 100755
ubuntu-no-stack-protector.diff, doko
#gccXXXXX.solenv.javaregistration.diff
ubuntu-mstopdf.diff, ccheney
-diff --git a/patches/dev300/human-icons-add2.diff
b/patches/dev300/human-icons-add2.diff
-new file mode 100644
-index 0000000..fd66c71
--- /dev/null
-+++ b/patches/dev300/human-icons-add2.diff
-@@ -0,0 +1,71 @@
-+diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
-+index 5961177..9c8a0cc 100644
-+--- a/packimages/pack/makefile.mk
-++++ b/packimages/pack/makefile.mk
++++ libreoffice/libreoffice-build/patches/dev300/human-icons-add2.diff
+@@ -0,0 +1,67 @@
++--- packimages/pack/makefile.mk
+++++ packimages/pack/makefile.mk
+@@ -38,13 +38,14 @@ IMAGES := $(COMMONBIN)$/images.zip
+ SORTED_LIST=$(RES)$/img$/sorted.lst
+ # Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
@@ -34,7 +27,7 @@ index 0000000..fd66c71
+
+ CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
+
OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
-++HUMAN_TARBALL=$(TARFILELOCATION)$/..$/ext-human-images/ooo_human_images-2011-02-22.tar.gz
+++HUMAN_TARBALL=$(SOLARSRC)/../../../ext-human-images/ooo_human_images-2011-02-22.tar.gz
+ CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
+
+ ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
@@ -76,10 +69,8 @@ index 0000000..fd66c71
++images_classic : $(MISC)$/classic.flag
+
++images_human : $(MISC)$/human.flag
-+diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
-+index ddcaf0d..67c3311 100644
-+--- a/vcl/source/app/settings.cxx
-++++ b/vcl/source/app/settings.cxx
++--- vcl/source/app/settings.cxx
+++++ vcl/source/app/settings.cxx
+@@ -825,7 +825,7 @@ ULONG StyleSettings::GetAutoSymbolsStyle() const
+ {
+ if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
--
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/e1psht5-0003qq...@alioth.debian.org
