[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. 9e8537d427eb2740f276e9a2ff345218950df1c0
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 9e8537d427eb2740f276e9a2ff345218950df1c0
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Feb 23 01:33:05 2011 +0100
changed version to 1:3.3.1~rc2-1ubuntu1
* some more changes for human icons and fixing up rules
diff --git a/changelog b/changelog
index 924b06b..f386836 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.3.1~rc2-1ubuntu1~ppa1) UNRELEASED; urgency=low
+libreoffice (1:3.3.1~rc2-1ubuntu1) natty; urgency=low
* moving transitional packages from libreoffice to openoffice.org source
* merging all rc2 debian changes
@@ -6,8 +6,9 @@ libreoffice (1:3.3.1~rc2-1ubuntu1~ppa1) UNRELEASED; urgency=low
* reenable human icons
* ubuntu branded progressbar
* regenerate control file
+ * reduced diff to debian
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 22 Feb 2011 01:47:43 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 23 Feb 2011 15:02:09 +0100
libreoffice (1:3.3.1~rc1-2ubuntu1~ppa1) natty; urgency=low
diff --git a/patches/human-icons-add.diff b/patches/human-icons-add.diff
index fa20b03..8335e90 100644
--- a/patches/human-icons-add.diff
+++ b/patches/human-icons-add.diff
@@ -12,7 +12,7 @@
ubuntu-mstopdf.diff, ccheney
--- /dev/null
+++ libreoffice/libreoffice-build/patches/dev300/human-icons-add2.diff
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,93 @@
+--- packimages/pack/makefile.mk
++++ packimages/pack/makefile.mk
+@@ -38,13 +38,14 @@ IMAGES := $(COMMONBIN)$/images.zip
@@ -80,3 +80,29 @@
+ else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
+ nRet = STYLE_SYMBOLS_CRYSTAL;
+ else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
++--- scp2/source/ooo/file_ooo.scp
+++++ scp2/source/ooo/file_ooo.scp
++@@ -1887,6 +1887,13 @@ File gid_File_ImagesTango_Zip
++ End
++ #endif
++
+++File gid_File_ImagesHuman_Zip
+++ TXT_FILE_BODY;
+++ Dir = gid_Dir_Share_Config;
+++ Name = "images_human.zip";
+++ Styles = (PACKED);
+++End
+++
++ File gid_File_ImagesClassic8_Zip
++ TXT_FILE_BODY;
++ Dir = gid_Dir_Share_Config;
++--- scp2/source/ooo/module_hidden_ooo.scp
+++++ scp2/source/ooo/module_hidden_ooo.scp
++@@ -729,6 +729,7 @@ Module gid_Module_Root_Files_Images
++ #ifdef THEME_TANGO
++ gid_File_ImagesTango_Zip
++ #endif
+++ gid_File_ImagesHuman_Zip
++ );
++ End
++
--
LibreOffice packaging repository
Reply to: