[Libreoffice-commits] core.git: 2 commits - configure.ac sysui/CustomTarget_share.mk

[Petr Mladek]

 configure.ac                |    2 +-
 sysui/CustomTarget_share.mk |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 977065d501b0e3a33482f3df65e602a93bc6e584
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri May 3 17:26:07 2013 +0200

    Use lowercase product name in desktop integration packages again
    
    The variable UNIXFILENAME used to use the lowercase product name
    before gbuildification.
    
    Change-Id: I09a5ff27acf07d394f712d943ea5f83765a7f834

diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 074c7a7..7c2eb89 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -106,9 +106,12 @@ PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)
 PRODUCTNAME.libreoffice := LibreOffice
 PRODUCTNAME.libreofficeodev := LibreOfficeDev
 PRODUCTNAME.oxygenoffice := OxygenOffice
-UNIXFILENAME.libreoffice := $(PRODUCTNAME.libreoffice)$(PRODUCTVERSION)
-UNIXFILENAME.libreofficedev := $(PRODUCTNAME.libreofficedev)$(PRODUCTVERSION)
-UNIXFILENAME.oxygenoffice := $(PRODUCTNAME.oxygenoffice)$(PRODUCTVERSION)
+PRODUCTNAMELC.libreoffice := libreoffice
+PRODUCTNAMELC.libreofficeodev := libreofficedev
+PRODUCTNAMELC.oxygenoffice := oxygenoffice
+UNIXFILENAME.libreoffice := $(PRODUCTNAMELC.libreoffice)$(PKGVERSIONSHORT)
+UNIXFILENAME.libreofficedev := $(PRODUCTNAMELC.libreofficedev)$(PKGVERSIONSHORT)
+UNIXFILENAME.oxygenoffice := $(PRODUCTNAMELC.oxygenoffice)$(PKGVERSIONSHORT)
 
 $(eval $(call gb_CustomTarget_CustomTarget,sysui/share))
 
commit 7b57cbbba1b75c3daebea256692e9b7f43357a56
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri May 3 17:22:39 2013 +0200

    PRODUCTVERSION variable always used only major and minor version
    
    For example, this fixes some mess in the desktop subpackages.
    It probably fixes strange things also in other places where
    we do not want the too detailed version 4.0.0.0.alpha0+
    
    Change-Id: I23482db4f9e3c907f3c7452a111acb54879b1f4f

diff --git a/configure.ac b/configure.ac
index 86d0f75..41dd1cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11447,7 +11447,7 @@ dnl ===================================================================
 dnl Product version
 dnl ===================================================================
 AC_MSG_CHECKING([for product version])
-PRODUCTVERSION=AC_PACKAGE_VERSION
+PRODUCTVERSION="$LIBO_VERSION_MAJOR.$LIBO_VERSION_MINOR"
 AC_MSG_RESULT([$PRODUCTVERSION])
 AC_SUBST(PRODUCTVERSION)