You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/07/02 16:45:13 UTC

[openoffice] branch AOO42X updated: Possible fix for macOS-Dev background graphic

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new bacc723  Possible fix for macOS-Dev background graphic
bacc723 is described below

commit bacc723e31d368564d2b4a0cb50de581ad91e813
Author: mseidel <ms...@apache.org>
AuthorDate: Thu Jul 2 18:40:39 2020 +0200

    Possible fix for macOS-Dev background graphic
    
    (cherry picked from commit 40d4a01ecacb607efe5dc313561c55b38d338734)
---
 main/solenv/bin/make_installer.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/main/solenv/bin/make_installer.pl b/main/solenv/bin/make_installer.pl
index 40b07b2..4600453 100644
--- a/main/solenv/bin/make_installer.pl
+++ b/main/solenv/bin/make_installer.pl
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 
@@ -1497,7 +1497,7 @@ if ( $installer::globals::iswindowsbuild ) { installer::control::read_encodingli
 ####################################################################
 # MacOS dmg build requires special DS_Store file to arrange icons
 ####################################################################
-if (($installer::globals::ismacdmgbuild) && ($installer::globals::product =~ /OpenOffice_Dev/)) { $installer::globals::devsnapshotbuild = 1; }
+if (($installer::globals::ismacdmgbuild) && ($installer::globals::product =~ /Apache_OpenOffice_Dev/)) { $installer::globals::devsnapshotbuild = 1; }
 
 if (($installer::globals::ismacdmgbuild) && ($installer::globals::product =~ /Apache_OpenOffice_Beta/)) { $installer::globals::betabuild = 1; }