[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sysui/CustomTarget_deb.mk

[Petr Mladek]

 sysui/CustomTarget_deb.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff2139ccf7dc950503d10f953f2afd4b3e93417d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jul 22 12:07:01 2013 +0200

    avoid file conflict in debian-menus package (fdo#67031)
    
    Use versioned file name for Debian specific /usr/lib/menu/libreoffice.
    
    All the other files have been versioned for years when we did this
    for RPMs. Heh, nobody noticed this with DEBs because people were
    used to that conflict and did not complain ;-)
    
    Change-Id: I1195279ff4825ed9154cf497ff3cc702f7309b6a
    Reviewed-on: https://gerrit.libreoffice.org/5026
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Reviewed-by: Thorsten Behrens <tbehrens at suse.com>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index b1186d6..82acd32 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -51,7 +51,7 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call gb_CustomTarget_ge
 		-e 's/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \
 		-e 's/%PREFIX/$(UNIXFILENAME.$*)/' \
 		-e 's/%ICONPREFIX/$(UNIXFILENAME.$*)/' \
-		> $(deb_WORKDIR)/$*/usr/lib/menu/$*
+		> $(deb_WORKDIR)/$*/usr/lib/menu/$*$(PKGVERSIONSHORT)
 	echo "Package: $*$(PKGVERSIONSHORT)-debian-menus" >$@
 	cat $< | tr -d "\015" | \
 		sed 's/%productname/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \