[Libreoffice-commits] core.git: 3 commits - reportbuilder/Module_reportbuilder.mk reportbuilder/Package_reportbuilder-templates.mk reportbuilder/Package_templates.mk Repository.mk scripting/Package_scriptproviderforpython.mk sysui/Package_share.mk

[David Tardon]

 Repository.mk                                |    6 +++---
 reportbuilder/Module_reportbuilder.mk        |    2 +-
 reportbuilder/Package_templates.mk           |    4 ++--
 scripting/Package_scriptproviderforpython.mk |    6 +++---
 sysui/Package_share.mk                       |    6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 4ee275e72e36a5a4182cf6860d709f095b4d87da
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 15 12:33:48 2018 +0200

    use the standard name pattern for a package
    
    Change-Id: I28f468b84ba0848c6af9bcc3c27971fae1e89fa7

diff --git a/Repository.mk b/Repository.mk
index a6dfe7cb8a1c..81268953a3a3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1062,7 +1062,7 @@ $(eval $(call gb_Helper_register_packages_for_install,python, \
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,python_scriptprovider, \
-    scriptproviderforpython \
+    scripting_scriptproviderforpython \
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,python_librelogo, \
diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk
index f16758707ee7..7e21439984b8 100644
--- a/scripting/Package_scriptproviderforpython.mk
+++ b/scripting/Package_scriptproviderforpython.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov))
+$(eval $(call gb_Package_Package,scripting_scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov))
 
-$(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_ETC_FOLDER)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb))
-$(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_LIB_PYUNO_FOLDER)/pythonscript.py,pythonscript.py))
+$(eval $(call gb_Package_add_file,scripting_scriptproviderforpython,$(LIBO_ETC_FOLDER)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb))
+$(eval $(call gb_Package_add_file,scripting_scriptproviderforpython,$(LIBO_LIB_PYUNO_FOLDER)/pythonscript.py,pythonscript.py))
 
 # vim: set noet sw=4 ts=4:
commit 7d01b75c68291ad57145c22d60db6959758e69ef
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 15 12:31:45 2018 +0200

    use the standard name pattern for a package
    
    Change-Id: Ia5bf93d6af6ff301439ef04593fcb1d13ab3aa9f

diff --git a/Repository.mk b/Repository.mk
index 8310a842eb96..a6dfe7cb8a1c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -811,7 +811,7 @@ $(eval $(call gb_Helper_register_packages, \
 	postprocess_registry \
 	readlicense_oo_readmes \
 	setup_native_misc \
-	share \
+	sysui_share \
 	vcl_fontunxpsprint \
 ))
 
diff --git a/sysui/Package_share.mk b/sysui/Package_share.mk
index 3fa7cbeee59d..25ae39bdf1b4 100644
--- a/sysui/Package_share.mk
+++ b/sysui/Package_share.mk
@@ -7,12 +7,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,share,$(share_WORKDIR)/libreoffice))
+$(eval $(call gb_Package_Package,sysui_share,$(share_WORKDIR)/libreoffice))
 
-$(eval $(call gb_Package_add_files,share,share/xdg,\
+$(eval $(call gb_Package_add_files,sysui_share,share/xdg,\
 	$(addsuffix .desktop,$(LAUNCHERLIST)) \
 ))
 
-$(eval $(call gb_Package_use_custom_target,share,sysui/share))
+$(eval $(call gb_Package_use_custom_target,sysui_share,sysui/share))
 
 # vim: set noet sw=4 ts=4:
commit 1be0d0cddd3571f8bb8bc590e0e22a3a092ca2d7
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 15 12:30:53 2018 +0200

    use the standard name pattern for a package
    
    Change-Id: Ie9113403bb87543816220c84e53bf8b30673b194

diff --git a/Repository.mk b/Repository.mk
index 69bcdae4d396..8310a842eb96 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1000,7 +1000,7 @@ $(eval $(call gb_Helper_register_packages_for_install,pdfimport, \
 endif
 
 $(eval $(call gb_Helper_register_packages_for_install,reportbuilder,\
-	reportbuilder-templates \
+	reportbuilder_templates \
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\
diff --git a/reportbuilder/Module_reportbuilder.mk b/reportbuilder/Module_reportbuilder.mk
index aaa3e596e845..4f554301d271 100644
--- a/reportbuilder/Module_reportbuilder.mk
+++ b/reportbuilder/Module_reportbuilder.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,reportbuilder))
 ifeq ($(ENABLE_REPORTBUILDER),TRUE)
 $(eval $(call gb_Module_add_targets,reportbuilder,\
 	Jar_reportbuilder \
-	Package_reportbuilder-templates \
+	Package_templates \
 ))
 endif
 
diff --git a/reportbuilder/Package_reportbuilder-templates.mk b/reportbuilder/Package_templates.mk
similarity index 84%
rename from reportbuilder/Package_reportbuilder-templates.mk
rename to reportbuilder/Package_templates.mk
index 9f137763198f..570c1f880514 100644
--- a/reportbuilder/Package_reportbuilder-templates.mk
+++ b/reportbuilder/Package_templates.mk
@@ -12,9 +12,9 @@
 # Package instead of an AllLangPackage (whose content would need to go into a
 # language pack in scp2) for now.
 
-$(eval $(call gb_Package_Package,reportbuilder-templates,$(SRCDIR)/reportbuilder/template))
+$(eval $(call gb_Package_Package,reportbuilder_templates,$(SRCDIR)/reportbuilder/template))
 
-$(eval $(call gb_Package_add_files_with_dir,reportbuilder-templates,$(LIBO_SHARE_FOLDER)/template, \
+$(eval $(call gb_Package_add_files_with_dir,reportbuilder_templates,$(LIBO_SHARE_FOLDER)/template, \
     common/wizard/report/default.otr \
 ))