summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2013-07-22 12:07:01 +0200
committerMichael Meeks <michael.meeks@suse.com>2013-07-22 10:53:18 +0000
commita6ae1cc0a2c5fd9f9bc0a834038b73e79b78fc6d (patch)
treeaa161ad2271722443977fd496e9928b677bca336 /sysui
parentfe5e35009f23b025ac58fcb5abc892a90c6a264c (diff)
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/5025 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
Diffstat (limited to 'sysui')
-rw-r--r--sysui/CustomTarget_deb.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index b1186d6691a2..82acd327843b 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)/' \