[Libreoffice-commits] core.git: external/hyphen external/Module_external.mk hyphen/ExternalPackage_hyphen.mk hyphen/ExternalProject_hyphen.mk hyphen/hyphen-android.patch hyphen/hyphen-build.patch hyphen/hyphen-fdo43931.patch hyphen/hyphen-lenwaswrong.patch hyphen/hyphen-rhmin.patch hyphen/Makefile hyphen/Module_hyphen.mk hyphen/README hyphen/StaticLibrary_hyphen.mk hyphen/UnpackedTarball_hyphen.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                  |    1 
 external/Module_external.mk               |    1 
 external/hyphen/ExternalPackage_hyphen.mk |   20 +++++++++++++++
 external/hyphen/ExternalProject_hyphen.mk |   28 ++++++++++++++++++++++
 external/hyphen/Makefile                  |    7 +++++
 external/hyphen/Module_hyphen.mk          |   32 +++++++++++++++++++++++++
 external/hyphen/README                    |    1 
 external/hyphen/StaticLibrary_hyphen.mk   |   22 +++++++++++++++++
 external/hyphen/UnpackedTarball_hyphen.mk |   22 +++++++++++++++++
 external/hyphen/hyphen-android.patch      |   20 +++++++++++++++
 external/hyphen/hyphen-build.patch        |   38 ++++++++++++++++++++++++++++++
 external/hyphen/hyphen-fdo43931.patch     |   15 +++++++++++
 external/hyphen/hyphen-lenwaswrong.patch  |   11 ++++++++
 external/hyphen/hyphen-rhmin.patch        |   27 +++++++++++++++++++++
 hyphen/ExternalPackage_hyphen.mk          |   20 ---------------
 hyphen/ExternalProject_hyphen.mk          |   28 ----------------------
 hyphen/Makefile                           |    7 -----
 hyphen/Module_hyphen.mk                   |   32 -------------------------
 hyphen/README                             |    1 
 hyphen/StaticLibrary_hyphen.mk            |   22 -----------------
 hyphen/UnpackedTarball_hyphen.mk          |   22 -----------------
 hyphen/hyphen-android.patch               |   20 ---------------
 hyphen/hyphen-build.patch                 |   38 ------------------------------
 hyphen/hyphen-fdo43931.patch              |   15 -----------
 hyphen/hyphen-lenwaswrong.patch           |   11 --------
 hyphen/hyphen-rhmin.patch                 |   27 ---------------------
 26 files changed, 244 insertions(+), 244 deletions(-)

New commits:
commit 0ba2b78a07e1111208eef45813e14c33c95cef6d
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Oct 17 20:00:40 2013 +0200

    fdo#70393: move hyphen to a subdir of external
    
    Change-Id: I5a112b6f588a704e682e7b50d5399d3da77fbacf
    Reviewed-on: https://gerrit.libreoffice.org/6308
    Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
    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 484d380..2c21a6c 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(call gb_Helper_optional,DESKTOP,helpcompiler) \
 	$(call gb_Helper_optional,HELP,helpcontent2) \
 	hwpfilter \
-	$(call gb_Helper_optional,HYPHEN,hyphen) \
 	i18nlangtag \
 	i18npool \
 	i18nutil \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 46bceaf..dac8d0a 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,HSQLDB,hsqldb) \
 	$(call gb_Helper_optional,HUNSPELL,hunspell) \
+	$(call gb_Helper_optional,HYPHEN,hyphen) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
diff --git a/hyphen/ExternalPackage_hyphen.mk b/external/hyphen/ExternalPackage_hyphen.mk
similarity index 100%
rename from hyphen/ExternalPackage_hyphen.mk
rename to external/hyphen/ExternalPackage_hyphen.mk
diff --git a/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk
similarity index 100%
rename from hyphen/ExternalProject_hyphen.mk
rename to external/hyphen/ExternalProject_hyphen.mk
diff --git a/hyphen/Makefile b/external/hyphen/Makefile
similarity index 100%
rename from hyphen/Makefile
rename to external/hyphen/Makefile
diff --git a/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk
similarity index 100%
rename from hyphen/Module_hyphen.mk
rename to external/hyphen/Module_hyphen.mk
diff --git a/hyphen/README b/external/hyphen/README
similarity index 100%
rename from hyphen/README
rename to external/hyphen/README
diff --git a/hyphen/StaticLibrary_hyphen.mk b/external/hyphen/StaticLibrary_hyphen.mk
similarity index 100%
rename from hyphen/StaticLibrary_hyphen.mk
rename to external/hyphen/StaticLibrary_hyphen.mk
diff --git a/hyphen/UnpackedTarball_hyphen.mk b/external/hyphen/UnpackedTarball_hyphen.mk
similarity index 72%
rename from hyphen/UnpackedTarball_hyphen.mk
rename to external/hyphen/UnpackedTarball_hyphen.mk
index 58049e9..5cd0af8 100644
--- a/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -12,11 +12,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,hyphen))
 $(eval $(call gb_UnpackedTarball_set_tarball,hyphen,$(HYPHEN_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
-	hyphen/hyphen-lenwaswrong.patch \
-	hyphen/hyphen-fdo43931.patch \
-	hyphen/hyphen-android.patch \
-	hyphen/hyphen-rhmin.patch \
-	hyphen/hyphen-build.patch \
+	external/hyphen/hyphen-lenwaswrong.patch \
+	external/hyphen/hyphen-fdo43931.patch \
+	external/hyphen/hyphen-android.patch \
+	external/hyphen/hyphen-rhmin.patch \
+	external/hyphen/hyphen-build.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/hyphen/hyphen-android.patch b/external/hyphen/hyphen-android.patch
similarity index 100%
rename from hyphen/hyphen-android.patch
rename to external/hyphen/hyphen-android.patch
diff --git a/hyphen/hyphen-build.patch b/external/hyphen/hyphen-build.patch
similarity index 100%
rename from hyphen/hyphen-build.patch
rename to external/hyphen/hyphen-build.patch
diff --git a/hyphen/hyphen-fdo43931.patch b/external/hyphen/hyphen-fdo43931.patch
similarity index 100%
rename from hyphen/hyphen-fdo43931.patch
rename to external/hyphen/hyphen-fdo43931.patch
diff --git a/hyphen/hyphen-lenwaswrong.patch b/external/hyphen/hyphen-lenwaswrong.patch
similarity index 100%
rename from hyphen/hyphen-lenwaswrong.patch
rename to external/hyphen/hyphen-lenwaswrong.patch
diff --git a/hyphen/hyphen-rhmin.patch b/external/hyphen/hyphen-rhmin.patch
similarity index 100%
rename from hyphen/hyphen-rhmin.patch
rename to external/hyphen/hyphen-rhmin.patch