ooo-build r14350 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Mon Oct 20 12:09:25 2008
New Revision: 14350
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14350&view=rev

Log:
2008-10-20  Tor Lillqvist  <tml novell com>

	Merge from ooo-build-3-0:

	* bin/unpack: For NovellWin32 and GoOoWin32 builds, create an
	extension dict-bundle.oxt that contains the prebuilt dictionaries
	based on the ones from SUSE instead of a writingaids.zip which
	isn't used any more.

	* patches/dev300/win32-prebuild-writingaids-zip.diff: Deliver
	dict-bundle.zip instead of writingaids.zip. So yeah, this diff
	file has a misleading name.

	* patches/dev300/win32-prebuild-writingaids-zip-scp2.diff: Add
	entry for the dict-bundle.oxt extension. Also this diff file has
	of course a misleading name.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff
   trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff

Modified: trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff
==============================================================================
--- trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff	(original)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff	Mon Oct 20 12:09:25 2008
@@ -1,6 +1,6 @@
 --- scp2/source/ooo/file_ooo.scp.org	2008-07-17 08:37:09.000000000 +0200
 +++ scp2/source/ooo/file_ooo.scp	2008-07-18 07:23:31.000000000 +0200
-@@ -2968,220 +2968,3 @@
+@@ -2968,220 +2968,14 @@
      Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu";
  End
  
@@ -221,3 +221,14 @@
 -	UnixRights = 444;
 -End
 -#endif
++
++#ifndef WITHOUT_MYSPELL_DICTS
++#ifdef WNT
++File gid_File_Extension_Dictionary_Bundle
++	Dir = gid_Brand_Dir_Share_Extension_Install;
++	Name = "dict-bundle.oxt";
++	Styles = (PACKED);
++	UnixRights = 444;
++End
++#endif
++#endif

Modified: trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff
==============================================================================
--- trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff	(original)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff	Mon Oct 20 12:09:25 2008
@@ -39,10 +39,10 @@
 @@ -1,2 +1,2 @@
  mkdir: %_DEST%\pck%_EXT%
 -..\%__SRC%\bin\*.oxt %_DEST%\pck%_EXT%\*.oxt
-+..\prebuilt\writingaids.zip             %_DEST%\pck%_EXT%\writingaids.zip
++..\prebuilt\dict-bundle.oxt             %_DEST%\pck%_EXT%\dict-bundle.oxt
 --- dictionaries/prebuilt/makefile.mk
 +++ dictionaries/prebuilt/makefile.mk
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,32 @@
 +#*************************************************************************
 +#
 +#   OpenOffice.org - a multi-platform office productivity suite
@@ -73,4 +73,4 @@
 +#*************************************************************************
 +PRJ=..
 +PRJNAME=dictionaries
-+ALLTAR : writingaids.zip
++ALLTAR : dict-bundle.oxt