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

[tml svn gnome org]

Author: tml
Date: Mon Sep 22 10:15:40 2008
New Revision: 13988
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13988&view=rev

Log:
2008-09-22  Tor Lillqvist  <tml novell com>

	* patches/dev300/build-identification.diff: Unfuzzify.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/build-identification.diff

Modified: trunk/patches/dev300/build-identification.diff
==============================================================================
--- trunk/patches/dev300/build-identification.diff	(original)
+++ trunk/patches/dev300/build-identification.diff	Mon Sep 22 10:15:40 2008
@@ -1,8 +1,8 @@
 --- solenv/bin/modules/installer/scriptitems.pm
 +++ solenv/bin/modules/installer/scriptitems.pm
 @@ -483,6 +483,8 @@
+ 		$value =~ s/\<productupdate\>/$productupdatestring/;
  		$value =~ s/\<updateid\>/$updateid/;
- 		$value =~ s/\<useragent\>/$useragent/;
  		$value =~ s/\<pkgformat\>/$installer::globals::packageformat/;
 +		$value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
 +		$value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
@@ -12,7 +12,7 @@
 --- scp2/source/ooo/common_brand.scp
 +++ scp2/source/ooo/common_brand.scp
 @@ -239,6 +239,24 @@
-     Value = "<useragent>";
+     Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH}; BundledLanguages=${AllLanguages})";
  End
  
 +ProfileItem gid_Brand_Profileitem_Version_Vendor