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 2021/03/30 15:34:36 UTC
[openoffice] branch trunk updated: Minor Cleanup
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3ba1351 Minor Cleanup
3ba1351 is described below
commit 3ba13510f75c55569ea5de82d92ed62e6247a06e
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Mar 30 17:34:17 2021 +0200
Minor Cleanup
---
main/sysui/desktop/productversion.mk | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/main/sysui/desktop/productversion.mk b/main/sysui/desktop/productversion.mk
index 55da41d..5f82f65 100644
--- a/main/sysui/desktop/productversion.mk
+++ b/main/sysui/desktop/productversion.mk
@@ -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,28 +7,29 @@
# 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.
-#
+#
#**************************************************************
+
.IF "$(OS)"=="LINUX"
-PKGREV = $(BUILD)
+PKGREV = $(BUILD)
.ELSE
-PKGREV = $(LAST_MINOR:s/m//:s/s/./)
+PKGREV = $(LAST_MINOR:s/m//:s/s/./)
.ENDIF
ABSLOCALOUT:=$(shell @cd $(PRJ) && pwd)$/$(ROUT)
-# create desktop-integration subfolder on linux
+# create desktop-integration subfolder on Linux
.IF "$(OS)"=="LINUX"
# rpm seems to require absolute paths here :(
PKGDIR:=$(ABSLOCALOUT)$/bin$/desktop-integration
@@ -53,8 +54,8 @@ PRODUCTVERSION = 4.5
PRODUCTVERSIONSHORT = 4
PKGVERSION = $(PRODUCTVERSION)
-# gnome-vfs treats everything behind the last '.' as an icon extension,
-# even though the "icon_filename" in '.keys' is specified as filename
+# gnome-vfs treats everything behind the last '.' as an icon extension,
+# even though the "icon_filename" in '.keys' is specified as filename
# without extension. Since it also does not know how to handle "2-writer"
# type icons :-), we are stripping all '.' for now.
# ToDo: maybe we use a product major later ??