Sat Oct 19 01:08:04 PDT 2013

RepositoryModule_host.mk                                 |    1 
 external/Module_external.mk                              |    1 
 external/more_fonts/ExternalPackage_dejavu.mk            |   38 +++++++++++++++
 external/more_fonts/ExternalPackage_gentium.mk           |   25 +++++++++
 external/more_fonts/ExternalPackage_liberation.mk        |   29 +++++++++++
 external/more_fonts/ExternalPackage_liberation_narrow.mk |   21 ++++++++
 external/more_fonts/ExternalPackage_libertineg.mk        |   27 ++++++++++
 external/more_fonts/ExternalPackage_opensans.mk          |   21 ++++++++
 external/more_fonts/ExternalPackage_ptserif.mk           |   21 ++++++++
 external/more_fonts/ExternalPackage_sourcecode.mk        |   19 +++++++
 external/more_fonts/ExternalPackage_sourcesans.mk        |   21 ++++++++
 external/more_fonts/Makefile                             |    7 ++
 external/more_fonts/Module_more_fonts.mk                 |   34 +++++++++++++
 external/more_fonts/Package_conf.mk                      |   16 ++++++
 external/more_fonts/README                               |    1 
 external/more_fonts/UnpackedTarball_dejavu.mk            |   14 +++++
 external/more_fonts/UnpackedTarball_gentium.mk           |   14 +++++
 external/more_fonts/UnpackedTarball_liberation.mk        |   14 +++++
 external/more_fonts/UnpackedTarball_liberation_narrow.mk |   14 +++++
 external/more_fonts/UnpackedTarball_libertineg.mk        |   15 +++++
 external/more_fonts/UnpackedTarball_opensans.mk          |   14 +++++
 external/more_fonts/UnpackedTarball_ptserif.mk           |   14 +++++
 external/more_fonts/UnpackedTarball_sourcecode.mk        |   14 +++++
 external/more_fonts/UnpackedTarball_sourcesans.mk        |   14 +++++
 external/more_fonts/fonts/fc_local.conf                  |   35 +++++++++++++
 more_fonts/ExternalPackage_dejavu.mk                     |   38 ---------------
 more_fonts/ExternalPackage_gentium.mk                    |   25 ---------
 more_fonts/ExternalPackage_liberation.mk                 |   29 -----------
 more_fonts/ExternalPackage_liberation_narrow.mk          |   21 --------
 more_fonts/ExternalPackage_libertineg.mk                 |   27 ----------
 more_fonts/ExternalPackage_opensans.mk                   |   21 --------
 more_fonts/ExternalPackage_ptserif.mk                    |   21 --------
 more_fonts/ExternalPackage_sourcecode.mk                 |   19 -------
 more_fonts/ExternalPackage_sourcesans.mk                 |   21 --------
 more_fonts/Makefile                                      |    7 --
 more_fonts/Module_more_fonts.mk                          |   34 -------------
 more_fonts/Package_conf.mk                               |   16 ------
 more_fonts/README                                        |    1 
 more_fonts/UnpackedTarball_dejavu.mk                     |   14 -----
 more_fonts/UnpackedTarball_gentium.mk                    |   14 -----
 more_fonts/UnpackedTarball_liberation.mk                 |   14 -----
 more_fonts/UnpackedTarball_liberation_narrow.mk          |   14 -----
 more_fonts/UnpackedTarball_libertineg.mk                 |   15 -----
 more_fonts/UnpackedTarball_opensans.mk                   |   14 -----
 more_fonts/UnpackedTarball_ptserif.mk                    |   14 -----
 more_fonts/UnpackedTarball_sourcecode.mk                 |   14 -----
 more_fonts/UnpackedTarball_sourcesans.mk                 |   14 -----
 more_fonts/fonts/fc_local.conf                           |   35 -------------
 48 files changed, 443 insertions(+), 443 deletions(-)

New commits:
commit f38b5ce9b87d86e73893a3d3384621da994d1499
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Oct 18 22:50:26 2013 +0200

    fdo#70393: move more_fonts to a subdir of external
    
    Change-Id: I82d3c4e7ad274e906d55fe883242bd9014ebe2e9
    Reviewed-on: https://gerrit.libreoffice.org/6344
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 5c33730..70eb666 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	linguistic \
 	lotuswordpro \
 	$(call gb_Helper_optional,DESKTOP,l10ntools) \
-	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
 	$(call gb_Helper_optional,MOZ,moz) \
 	$(call gb_Helper_optional,MARIADBC,mysqlc) \
 	$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index f4abc76..8e7b93a 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,LPSOLVE,lpsolve) \
 	$(call gb_Helper_optional,MARIADB,libmariadb) \
 	$(call gb_Helper_optional,MDDS,mdds) \
+	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
diff --git a/more_fonts/ExternalPackage_dejavu.mk b/external/more_fonts/ExternalPackage_dejavu.mk
similarity index 100%
rename from more_fonts/ExternalPackage_dejavu.mk
rename to external/more_fonts/ExternalPackage_dejavu.mk
diff --git a/more_fonts/ExternalPackage_gentium.mk b/external/more_fonts/ExternalPackage_gentium.mk
similarity index 100%
rename from more_fonts/ExternalPackage_gentium.mk
rename to external/more_fonts/ExternalPackage_gentium.mk
diff --git a/more_fonts/ExternalPackage_liberation.mk b/external/more_fonts/ExternalPackage_liberation.mk
similarity index 100%
rename from more_fonts/ExternalPackage_liberation.mk
rename to external/more_fonts/ExternalPackage_liberation.mk
diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/external/more_fonts/ExternalPackage_liberation_narrow.mk
similarity index 100%
rename from more_fonts/ExternalPackage_liberation_narrow.mk
rename to external/more_fonts/ExternalPackage_liberation_narrow.mk
diff --git a/more_fonts/ExternalPackage_libertineg.mk b/external/more_fonts/ExternalPackage_libertineg.mk
similarity index 100%
rename from more_fonts/ExternalPackage_libertineg.mk
rename to external/more_fonts/ExternalPackage_libertineg.mk
diff --git a/more_fonts/ExternalPackage_opensans.mk b/external/more_fonts/ExternalPackage_opensans.mk
similarity index 100%
rename from more_fonts/ExternalPackage_opensans.mk
rename to external/more_fonts/ExternalPackage_opensans.mk
diff --git a/more_fonts/ExternalPackage_ptserif.mk b/external/more_fonts/ExternalPackage_ptserif.mk
similarity index 100%
rename from more_fonts/ExternalPackage_ptserif.mk
rename to external/more_fonts/ExternalPackage_ptserif.mk
diff --git a/more_fonts/ExternalPackage_sourcecode.mk b/external/more_fonts/ExternalPackage_sourcecode.mk
similarity index 100%
rename from more_fonts/ExternalPackage_sourcecode.mk
rename to external/more_fonts/ExternalPackage_sourcecode.mk
diff --git a/more_fonts/ExternalPackage_sourcesans.mk b/external/more_fonts/ExternalPackage_sourcesans.mk
similarity index 100%
rename from more_fonts/ExternalPackage_sourcesans.mk
rename to external/more_fonts/ExternalPackage_sourcesans.mk
diff --git a/more_fonts/Makefile b/external/more_fonts/Makefile
similarity index 71%
rename from more_fonts/Makefile
rename to external/more_fonts/Makefile
index ccb1c85..e4968cf 100644
--- a/more_fonts/Makefile
+++ b/external/more_fonts/Makefile
@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk
similarity index 100%
rename from more_fonts/Module_more_fonts.mk
rename to external/more_fonts/Module_more_fonts.mk
diff --git a/more_fonts/Package_conf.mk b/external/more_fonts/Package_conf.mk
similarity index 85%
rename from more_fonts/Package_conf.mk
rename to external/more_fonts/Package_conf.mk
index 021a51f..43b9843 100644
--- a/more_fonts/Package_conf.mk
+++ b/external/more_fonts/Package_conf.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/more_fonts/fonts))
+$(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/external/more_fonts/fonts))
 
 $(eval $(call gb_Package_set_outdir,more_fonts_conf,$(INSTROOT)))
 
diff --git a/more_fonts/README b/external/more_fonts/README
similarity index 100%
rename from more_fonts/README
rename to external/more_fonts/README
diff --git a/more_fonts/UnpackedTarball_dejavu.mk b/external/more_fonts/UnpackedTarball_dejavu.mk
similarity index 100%
rename from more_fonts/UnpackedTarball_dejavu.mk
rename to external/more_fonts/UnpackedTarball_dejavu.mk
diff --git a/more_fonts/UnpackedTarball_gentium.mk b/external/more_fonts/UnpackedTarball_gentium.mk
similarity index 100%
rename from more_fonts/UnpackedTarball_gentium.mk
rename to external/more_fonts/UnpackedTarball_gentium.mk
diff --git a/more_fonts/UnpackedTarball_liberation.mk b/external/more_fonts/UnpackedTarball_liberation.mk
similarity index 100%
rename from more_fonts/UnpackedTarball_liberation.mk
rename to external/more_fonts/UnpackedTarball_liberation.mk
diff --git a/more_fonts/UnpackedTarball_liberation_narrow.mk b/external/more_fonts/UnpackedTarball_liberation_narrow.mk
similarity index 100%
rename from more_fonts/UnpackedTarball_liberation_narrow.mk
rename to external/more_fonts/UnpackedTarball_liberation_narrow.mk
diff --git a/more_fonts/UnpackedTarball_libertineg.mk b/external/more_fonts/UnpackedTarball_libertineg.mk
similarity index 100%
rename from more_fonts/UnpackedTarball_libertineg.mk
rename to external/more_fonts/UnpackedTarball_libertineg.mk
diff --git a/more_fonts/UnpackedTarball_opensans.mk b/external/more_fonts/UnpackedTarball_opensans.mk
similarity index 100%
rename from more_fonts/UnpackedTarball_opensans.mk
rename to external/more_fonts/UnpackedTarball_opensans.mk
diff --git a/more_fonts/UnpackedTarball_ptserif.mk b/external/more_fonts/UnpackedTarball_ptserif.mk
similarity index 100%
rename from more_fonts/UnpackedTarball_ptserif.mk
rename to external/more_fonts/UnpackedTarball_ptserif.mk
diff --git a/more_fonts/UnpackedTarball_sourcecode.mk b/external/more_fonts/UnpackedTarball_sourcecode.mk
similarity index 100%
rename from more_fonts/UnpackedTarball_sourcecode.mk
rename to external/more_fonts/UnpackedTarball_sourcecode.mk
diff --git a/more_fonts/UnpackedTarball_sourcesans.mk b/external/more_fonts/UnpackedTarball_sourcesans.mk
similarity index 100%
rename from more_fonts/UnpackedTarball_sourcesans.mk
rename to external/more_fonts/UnpackedTarball_sourcesans.mk
diff --git a/more_fonts/fonts/fc_local.conf b/external/more_fonts/fonts/fc_local.conf
similarity index 100%
rename from more_fonts/fonts/fc_local.conf
rename to external/more_fonts/fonts/fc_local.conf
