RepositoryModule_host.mk | 1 ct2n/ConvertTextToNumber-1.3.2-no-license.patch | 16 - ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch | 104 ---------- ct2n/ExternalPackage_ct2n.mk | 40 --- ct2n/Makefile | 7 ct2n/Module_ct2n.mk | 21 -- ct2n/README | 4 ct2n/UnpackedTarball_ct2n.mk | 31 -- ct2n/description-en-US.txt | 4 external/Module_external.mk | 1 external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch | 16 + external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch | 104 ++++++++++ external/ct2n/ExternalPackage_ct2n.mk | 40 +++ external/ct2n/Makefile | 7 external/ct2n/Module_ct2n.mk | 17 + external/ct2n/README | 4 external/ct2n/UnpackedTarball_ct2n.mk | 31 ++ external/ct2n/description-en-US.txt | 4 18 files changed, 224 insertions(+), 228 deletions(-)
New commits: commit 39f73d93874114e2bacfd73da137180aad95a3f6 Author: Khaled Hosny <[email protected]> Date: Thu Oct 17 19:22:46 2013 +0200 fdo#70393: move ct2n to a subdir of external Change-Id: If93ae0fa968539f72c9dbf29b4496355b6d66e05 Reviewed-on: https://gerrit.libreoffice.org/6297 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index ee95730..e88deaf 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ cppuhelper \ cpputools \ $(call gb_Helper_optional,CRASHREP,crashrep) \ - $(call gb_Helper_optional,CT2N,ct2n) \ cui \ $(call gb_Helper_optional,CURL,curl) \ dbaccess \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 2c8b492..9be3b5a 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -25,6 +25,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,CAIRO,cairo) \ $(call gb_Helper_optional,CLUCENE,clucene) \ $(call gb_Helper_optional,CPPUNIT,cppunit) \ + $(call gb_Helper_optional,CT2N,ct2n) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/ct2n/ConvertTextToNumber-1.3.2-no-license.patch b/external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch similarity index 100% rename from ct2n/ConvertTextToNumber-1.3.2-no-license.patch rename to external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch diff --git a/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch b/external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch similarity index 100% rename from ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch rename to external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch diff --git a/ct2n/ExternalPackage_ct2n.mk b/external/ct2n/ExternalPackage_ct2n.mk similarity index 100% rename from ct2n/ExternalPackage_ct2n.mk rename to external/ct2n/ExternalPackage_ct2n.mk diff --git a/ct2n/Makefile b/external/ct2n/Makefile similarity index 100% rename from ct2n/Makefile rename to external/ct2n/Makefile diff --git a/ct2n/Module_ct2n.mk b/external/ct2n/Module_ct2n.mk similarity index 91% rename from ct2n/Module_ct2n.mk rename to external/ct2n/Module_ct2n.mk index 873f31b..55fdcce 100644 --- a/ct2n/Module_ct2n.mk +++ b/external/ct2n/Module_ct2n.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,ConvertTextToNumber)) -ifneq (,$(filter CT2N,$(BUILD_TYPE))) - $(eval $(call gb_Module_add_targets,ConvertTextToNumber,\ ExternalPackage_ct2n \ UnpackedTarball_ct2n \ )) -endif - # vim:set noet sw=4 ts=4: diff --git a/ct2n/README b/external/ct2n/README similarity index 100% rename from ct2n/README rename to external/ct2n/README diff --git a/ct2n/UnpackedTarball_ct2n.mk b/external/ct2n/UnpackedTarball_ct2n.mk similarity index 87% rename from ct2n/UnpackedTarball_ct2n.mk rename to external/ct2n/UnpackedTarball_ct2n.mk index df9f466..8e90ae9 100644 --- a/ct2n/UnpackedTarball_ct2n.mk +++ b/external/ct2n/UnpackedTarball_ct2n.mk @@ -12,8 +12,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,ConvertTextToNumber)) $(eval $(call gb_UnpackedTarball_set_tarball,ConvertTextToNumber,$(CT2N_TARBALL),0)) $(eval $(call gb_UnpackedTarball_add_patches,ConvertTextToNumber,\ - ct2n/ConvertTextToNumber-1.3.2-no-license.patch \ - ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \ + external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch \ + external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \ )) $(eval $(call gb_UnpackedTarball_fix_end_of_line,ConvertTextToNumber,\ diff --git a/ct2n/description-en-US.txt b/external/ct2n/description-en-US.txt similarity index 100% rename from ct2n/description-en-US.txt rename to external/ct2n/description-en-US.txt _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
