instsetoo_native/CustomTarget_install.mk | 2 setup_native/source/packinfo/package_names.txt | 64 +++++++++--------- setup_native/source/packinfo/packinfo_office_help.txt | 2 setup_native/source/packinfo/packinfo_office_lang.txt | 20 ++--- 4 files changed, 44 insertions(+), 44 deletions(-)
New commits: commit 39b04ad7cb2e10f32e92d3c9bec57e35f64a3304 Author: Martin Hollmichel <[email protected]> Date: Mon Jun 29 18:18:22 2015 +0100 Remove some hard coded references to "LibreOffice" as Productname. Change-Id: Ibd0a500d7ba31ec4c25bad64b39311d45e94dca3 Reviewed-on: https://gerrit.libreoffice.org/16590 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Meeks <[email protected]> Tested-by: Michael Meeks <[email protected]> diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index f894ae5..1643783 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -80,7 +80,7 @@ $(foreach pkgformat,$(5),\ && $(PERL) -w $< \ -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \ - -p LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \ + -p $(PRODUCTNAME)$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \ -u $(instsetoo_OUT) \ -buildid $(if $(filter deb0 rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \ $(if $(filter WNT,$(OS)), \ diff --git a/setup_native/source/packinfo/package_names.txt b/setup_native/source/packinfo/package_names.txt index ac89557..f23e332 100644 --- a/setup_native/source/packinfo/package_names.txt +++ b/setup_native/source/packinfo/package_names.txt @@ -1,37 +1,37 @@ -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING Language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-base Base language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-calc Calc language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-draw Draw language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-fonts Language fonts module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-help Language help module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-impress Impress language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-math Math language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-onlineupd Online update language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-res Language resource module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-writer Writer language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-activex ActiveX control for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base Base module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc Calc module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core Core module for LibreOffice %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING Language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-base Base language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-calc Calc language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-draw Draw language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-fonts Language fonts module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-help Language help module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-impress Impress language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-math Math language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-onlineupd Online update language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-res Language resource module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-writer Writer language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-activex ActiveX control for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base Base module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc Calc module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core Core module for %PRODUCTNAME %PRODUCTVERSION %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-dict-gl Gl dictionary for %PRODUCTNAME %PRODUCTVERSION %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-dict-vi Vietnamese dictionary for %PRODUCTNAME %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-draw Draw module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-emailmerge Email mailmerge module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-gnome-integratn Gnome integration module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-graphicfilter Graphic filter module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-headless Headless display module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-images Images module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress Impress module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-kde-integration KDE integration module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math Math module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-onlineupdate Online update modul for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts Mailcap module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooolinguistic Linguistic module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno Pyuno module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-spellcheck English spellchecker module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-testtool Testtool module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer Writer module for LibreOffice %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-xsltfilter XSLT filter samples module for LibreOffice %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-draw Draw module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-emailmerge Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-gnome-integratn Gnome integration module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-graphicfilter Graphic filter module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-headless Headless display module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-images Images module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress Impress module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-kde-integration KDE integration module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math Math module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-onlineupdate Online update modul for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts Mailcap module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooolinguistic Linguistic module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno Pyuno module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-spellcheck English spellchecker module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-testtool Testtool module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer Writer module for %PRODUCTNAME %PRODUCTVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-xsltfilter XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af Af dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs Cs dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da Da dictionary for %PRODUCTNAME %PRODUCTVERSION diff --git a/setup_native/source/packinfo/packinfo_office_help.txt b/setup_native/source/packinfo/packinfo_office_help.txt index 306a598..f48cde4 100644 --- a/setup_native/source/packinfo/packinfo_office_help.txt +++ b/setup_native/source/packinfo/packinfo_office_help.txt @@ -44,7 +44,7 @@ requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION % copyright = "2015 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" -description = "Help module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" +description = "Help module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%PACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt index e5016f9..60311b3 100644 --- a/setup_native/source/packinfo/packinfo_office_lang.txt +++ b/setup_native/source/packinfo/packinfo_office_lang.txt @@ -44,7 +44,7 @@ requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERS copyright = "2015 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" -description = "Language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" +description = "Language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%PACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" @@ -60,7 +60,7 @@ requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION % copyright = "2015 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" -description = "Language fonts module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" +description = "Language fonts module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%PACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" @@ -76,7 +76,7 @@ requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION % copyright = "2015 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" -description = "Language resource module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" +description = "Language resource module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%PACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" @@ -92,7 +92,7 @@ requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION % copyright = "2015 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" -description = "Writer language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" +description = "Writer language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%PACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer" @@ -108,7 +108,7 @@ requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION % copyright = "2015 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" -description = "Calc language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" +description = "Calc language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%PACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc" @@ -124,7 +124,7 @@ requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION % copyright = "2015 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" -description = "Impress language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" +description = "Impress language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%PACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress" @@ -140,7 +140,7 @@ requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION % copyright = "2015 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" -description = "Draw language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" +description = "Draw language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%PACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-draw" @@ -156,7 +156,7 @@ requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION % copyright = "2015 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" -description = "Math language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" +description = "Math language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%PACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math" @@ -172,7 +172,7 @@ requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION % copyright = "2015 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" -description = "Base language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" +description = "Base language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%PACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base" @@ -188,7 +188,7 @@ requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION % copyright = "2015 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" -description = "Online update language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" +description = "Online update language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%PACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-onlineupdate" _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
