diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-07-22 12:07:01 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-07-22 12:18:03 +0200 |
| commit | 6f4e3a2e272e1ed269efe3ba11915378ffb41a77 (patch) | |
| tree | e6b8dc18606fa3a3908743382264a8db43989582 | |
| parent | 27925032cd5aec8805185679e01c687c40bbd617 (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
| -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)/' \ |