sysui/CustomTarget_deb.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9544ab3c41048939b58fd4898a7532c53f37d056
Author: Petr Mladek <pmla...@suse.cz>
Date: Thu Jul 18 15:32:09 2013 +0200
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
Reviewed-on: https://gerrit.libreoffice.org/4970
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Lionel Elie Mamane <lio...@mamane.lu>
Reviewed-on: https://gerrit.libreoffice.org/5020
Reviewed-by: David Tardon <dtar...@redhat.com>
Reviewed-by: Michael Meeks <michael.me...@suse.com>
Tested-by: Michael Meeks <michael.me...@suse.com>
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index 81afdd9..b1186d6 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
