summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2013-07-18 15:32:09 +0200
committerPetr Mladek <pmladek@suse.cz>2013-07-18 15:42:24 +0200
commitdefe6adcdf2d808eda4767bafd383a22efc98334 (patch)
tree0d87476f649665864bccd6bcd71cfaf431af1da9 /sysui
parent4a578dc9c7b9c5697f624807790565c99ccb919d (diff)
use correct package name in libreofficeX.Y-debian-menus package (fdo#67041)
Add back the missing "-debian-menus" suffix. It was lost during gbuildisation. Also add the X.Y version. The files and menu entries have been versioned since LO 4.1 but we did not versioned the package name ;-) Finally, fix typo in the package version definition and mention the release number again. Change-Id: I26e1664349c326db199905e6c5b1efb5d2d1723c
Diffstat (limited to 'sysui')
-rw-r--r--sysui/CustomTarget_deb.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index 81afdd9272a2..b1186d6691a2 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -52,11 +52,11 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call gb_CustomTarget_ge
-e 's/%PREFIX/$(UNIXFILENAME.$*)/' \
-e 's/%ICONPREFIX/$(UNIXFILENAME.$*)/' \
> $(deb_WORKDIR)/$*/usr/lib/menu/$*
- echo "Package: $*" >$@
+ echo "Package: $*$(PKGVERSIONSHORT)-debian-menus" >$@
cat $< | tr -d "\015" | \
sed 's/%productname/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \
>> $@
- echo "Version: $(PKGVERSION)-$(LIBV_VERSION_PATCH)" >>$@
+ echo "Version: $(PKGVERSION)-$(LIBO_VERSION_PATCH)" >>$@
du -k -s $(deb_WORKDIR)/$* | awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >>$@
$(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb: $(deb_WORKDIR)/%/DEBIAN/postrm $(deb_WORKDIR)/%/DEBIAN/postinst $(deb_WORKDIR)/%/DEBIAN/prerm $(deb_WORKDIR)/%/DEBIAN/control $(call gb_Library_get_target,getuid)