ooo-build r10038 - in trunk: . patches/src680

[tml svn gnome org]

Author: tml
Date: 2007-08-09 12:20:22 +0100 (Thu, 09 Aug 2007)
New Revision: 10038
ViewCVS link: http://svn.gnome.org/viewcvs/ooo-build?rev=10038&view=rev

Modified:
   trunk/ChangeLog
   trunk/patches/src680/novell-win32-msi-patchability.diff
   trunk/patches/src680/novell-win32-vrb-branding.diff
Log:
2007-08-09  Tor Lillqvist  <tml novell com>

	* patches/src680/novell-win32-msi-patchability.diff
	* patches/src680/novell-win32-vrb-branding.diff: Rethink version
	numbers used on the Win32 Novell Edition once more. For the VRBs
	(Version Resource Blocks) of DLLs and EXEs the four parts are:
	VERVARIANT (the hopefully monotonically increasing upstream
	"buildid", now at 9188), OOO_PACKAGEVERSION_MAJOR (i.e. 2),
	OOO_PACKAGEVERSION_MINOR times 100 plus OOO_PACKAGEVERSION_MICRO
	(currently 300), and OOO_PATCHLEVEL (zero until after RTM). Put
	the same version in the Version column of the File table.

	Wheen building an incremental post-RTM patch, set the
	OOO_PATCHLEVEL environment variable when running
	config_office/configure. Rebuilt DLLs and EXEs will then get
	updated VRBs. The Version column in the File table for those files
	needs to be manually edited with Orca after building the MSI,
	though, because the code in file.pm uses the same version for all
	files. There is no provision for per-file patchlevel
	information. That probably would be a good thing to add.