RepositoryExternal.mk | 2 +-
solenv/bin/modules/installer/control.pm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8724bcff1e4c9e666125927659db747b483401c3
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Sun Mar 26 04:01:02 2017 +0200
Fix gpgme packaging
Change-Id: I26ef55b8a7a210f9d86becd4f0aa10c2598681fd
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 75897bc7799e..ed00ea4a9dac 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3413,7 +3413,7 @@ $(call gb_LinkTarget_use_package,$(1),gpgme)
endef
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
- gpgmepp \
+ gpgme \
libassuan \
libgpg-error \
))
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 7670535715ea..decf519eb881 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -325,7 +325,7 @@ sub check_logfile
$compareline =~ s/Error\.html//g; # removing all occurrences of
"Error.html"
$compareline =~ s/error\.py//g; # removing all occurrences of
"error.py"
$compareline =~ s/error\.cpython\-3.(\.opt\-.|)\.py[co]//g; #
removing all occurrences of "error-cpython"
- $compareline =~ s/libgpg-error-0.dll//g;
+ $compareline =~ s/libgpg-error//g;
$compareline =~ s/Error-xref\.html//g;
if ( $compareline =~ /\bError\b/i )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
