[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sysui/desktop

[Caolán McNamara]

 sysui/desktop/productversion.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 58e524761aabb4bfc214e0375aaa4ec94b3e8903
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Apr 10 16:25:19 2012 +0200

    use x.y.z version also for desktop integration packages (fdo#47840)
    
    This version scheme is used for other packages as well. It is important for
    the desktop integration packages now because we started reseting buildid for
    each bugfix release (fdo#47840). This value is used also for the release
    number of Linux packages.
    (cherry picked from commit 4045e770193ae632aca7075105dda89686c597d6)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index 398241d..5a186bc 100755
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -45,7 +45,8 @@ PKGDIR=$(BIN)
 
 .INCLUDE : productversion.mk
 
-PKGVERSION = $(PRODUCTVERSION)
+PKGVERSION = $(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONMICRO)
+
 # 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"