diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-07-22 12:07:01 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-22 16:59:54 +0000 |
| commit | ff2139ccf7dc950503d10f953f2afd4b3e93417d (patch) | |
| tree | 6b3fda74e19444daf9dddb0a6004167f4c1d35fc | |
| parent | 7d61c222ff1fded3524351bf6b16e34736ac17fa (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/5026
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | sysui/CustomTarget_deb.mk | 2 |
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)/' \ |