[Libreoffice-commits] core.git: sysui/CustomTarget_deb.mk

[Petr Mladek]

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

New commits:
commit 6f4e3a2e272e1ed269efe3ba11915378ffb41a77
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

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)/' \