[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - instsetoo_native/CustomTarget_setup.mk scp2/source

[Michael Meeks]

 instsetoo_native/CustomTarget_setup.mk |    2 +-
 scp2/source/ooo/common_brand.scp       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bf75c47b284f73165aa815ec96cef627c31ea0ab
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Mar 11 09:48:21 2016 +0000

    User-Agent: disable reporting of languages.
    
    Nowadays we have them all, so it is big, non-useful data.
    
    Reviewed-on: https://gerrit.libreoffice.org/23143
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 2a9095570a2430568f5c5e1c91edd6a717e099a6)
    
    User-Agent: disable reporting of languages - also for installsets
    
    extends 2a9095570a2430568f5c5e1c91edd6a717e099a6 to not only apply to
    instdir, but also to packaged installers (that use data from scp2)
    
    (cherry picked from commit 6c47de46613b531bd975d073cf31c3fda6f8b8da)
    
    Change-Id: Ia08b863852e6a0916f30e2ecdc14eea4fafe2ab0
    Reviewed-on: https://gerrit.libreoffice.org/23151
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index e4cdd53..a8d56a3 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -143,7 +143,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 		&& echo 'ReferenceOOoMajorMinor=4.1' \
 		&& echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \
 		&& echo 'UpdateURL=$(if $(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if $(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \
-		&& echo 'UpdateUserAgent=<PRODUCT> ($${buildid}; $${_OS}; $${_ARCH}; <OPTIONAL_OS_HW_DATA>BundledLanguages=$${AllLanguages})' \
+		&& echo 'UpdateUserAgent=<PRODUCT> ($${buildid}; $${_OS}; $${_ARCH}; <OPTIONAL_OS_HW_DATA>)' \
 		&& echo 'Vendor=$(OOO_VENDOR)' \
 	) > $@
 
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 1933551..8ee6d1c 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -921,7 +921,7 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent
     Section = "Version";
     Order = 17;
     Key = "UpdateUserAgent";
-    Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH}; BundledLanguages=${AllLanguages})";
+    Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH})";
 End
 
 ProfileItem gid_Brand_Profileitem_Version_Vendor