[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - setup_native/source solenv/bin

[Matthias Seidel]

 setup_native/source/packinfo/package_names.txt   |    2 +-
 setup_native/source/packinfo/packinfo_office.txt |    2 +-
 solenv/bin/make_ext_update_info.pl               |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d6e2a2cce5cd2118403f0435c3bd2698164115c4
Author: Matthias Seidel <mseidel at apache.org>
Date:   Sat Feb 24 11:42:03 2018 +0000

    Changed description for package "ooofonts" from "Mailcap module..." to "Fonts module..."

diff --git a/setup_native/source/packinfo/package_names.txt b/setup_native/source/packinfo/package_names.txt
index c726cda609c4..86f3a8db438f 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -32,7 +32,7 @@
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration	KDE integration module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math	Math module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate	Online update modul for %APACHEPROJECTNAME %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts	Mailcap module for %APACHEPROJECTNAME %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts	Fonts module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic	Linguistic module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno	Pyuno module for %APACHEPROJECTNAME %PRODUCTVERSION
 %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck	English spellchecker module for %APACHEPROJECTNAME %PRODUCTVERSION
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 545e690746d3..984db61a9e04 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -376,7 +376,7 @@ requires = "%BASISPACKAGEPREFIX-core01"
 copyright = "2012-2018 by The Apache Software Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "Apache Software Foundation"
-description = "Mailcap module for %APACHEPROJECTNAME %PRODUCTVERSION"
+description = "Fonts module for %APACHEPROJECTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%OOOPACKAGEVERSION"
 End
commit 7f4ad2a39dfaff0bb50aaac409ca5f61e93ef1d6
Author: Matthias Seidel <mseidel at apache.org>
Date:   Sat Feb 24 11:39:06 2018 +0000

    Fixed double wording in comment

diff --git a/solenv/bin/make_ext_update_info.pl b/solenv/bin/make_ext_update_info.pl
index ae6ca7719686..33bd3a463dcf 100755
--- a/solenv/bin/make_ext_update_info.pl
+++ b/solenv/bin/make_ext_update_info.pl
@@ -125,7 +125,7 @@ writeUpdateInformationData($ARGV[0]);
 die "Error: The description.xml does not contain a <identifier> element.\n" unless $identifier;
 die "Error: The description.xml does not contain a <version> element. \n" unless $version;
 
-#write the write the update-download element and the children.
+#write the update-download element and the children.
 #the indention of <update-download> corresponds to that of <version>
 print $FH ' 'x$indent, '<update-download>', "\n";
 #check if update-urls have been provided through --update-url option