diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-04-02 16:12:06 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-03 09:07:32 +0100 |
commit | 2a5077c1070cd4c0041c6bded778e8400dd56f30 (patch) | |
tree | bad0272cf9fc0b00ec52731a1da499f771168776 /sysui/CustomTarget_share.mk | |
parent | 4c5bada9d76d8f9247dd5fb269065f91abc233d0 (diff) |
start deprecating spadmin by removing it from the menus
we keep the printer admin tool, just not install the .desktop
file for it anymore.
Change-Id: I41fcdcca555e16d76fa2de4a929b6ad508b6c066
Diffstat (limited to 'sysui/CustomTarget_share.mk')
-rw-r--r-- | sysui/CustomTarget_share.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index 0c2f023ade29..074c7a721f16 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -10,7 +10,7 @@ share_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/share) share_SRCDIR := $(SRCDIR)/sysui/desktop -LAUNCHERLIST_APPS := writer calc draw impress math base printeradmin startcenter +LAUNCHERLIST_APPS := writer calc draw impress math base startcenter LAUNCHERLIST := $(LAUNCHERLIST_APPS) qstart xsltfilter LAUNCHERS := $(foreach launcher,$(LAUNCHERLIST),$(share_SRCDIR)/menus/$(launcher).desktop) @@ -98,9 +98,7 @@ MIMEDESKTOPS := $(foreach mime,$(MIMELIST),$(share_SRCDIR)/mimetypes/$(mime).des ULFS := documents.ulf \ launcher_comment.ulf \ launcher_genericname.ulf \ - launcher_unityquicklist.ulf \ - launcher_name.ulf - + launcher_unityquicklist.ulf PRODUCTLIST := libreoffice libreofficedev oxygenoffice PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO) @@ -202,8 +200,6 @@ $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \ $(PERL) $(share_SRCDIR)/share/brand.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -u '$$(UNIXPRODUCTNAME)$$(BRANDPACKAGEVERSION)' \ --iconprefix '$$(UNIXBASISROOTNAME)' $^ $(share_WORKDIR)/$* $(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \ - --ext "desktop" --key "Name" $(share_WORKDIR)/launcher_name.ulf - $(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \ --ext "desktop" --key "Comment" $(share_WORKDIR)/launcher_comment.ulf $(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \ --ext "desktop" --key "GenericName" $(share_WORKDIR)/launcher_genericname.ulf |