From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 488E26DE0B2B for ; Thu, 3 Nov 2016 13:40:06 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" X-Spam-Flag: NO X-Spam-Score: -0.216 X-Spam-Level: X-Spam-Status: No, score=-0.216 tagged_above=-999 required=5 tests=[AWL=-0.196, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xXyQeFYETPot for ; Thu, 3 Nov 2016 13:40:05 -0700 (PDT) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by arlo.cworth.org (Postfix) with ESMTPS id 7A5DC6DE09FB for ; Thu, 3 Nov 2016 13:40:03 -0700 (PDT) Received: by mail-lf0-f65.google.com with SMTP id p100so3444791lfg.2 for ; Thu, 03 Nov 2016 13:40:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikula-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=IgGRhmQAV8l/ejNVJCkuV0JAjB7poESHWXmqcIQ0wvQ=; b=tKMkgK/hEjHKhUU4TDXlXSB56ul7lR443e42+kmwSHTNmq6VwrHMwkbmVF2+gGpyt+ Uvr9eaCQgxIi9FOxNk04+vBi/GDmWLCnRtWaMWpAUQFmdwch0ghmz86S3EF+RjuA4fbt rSLLF/nOFKZbs1mJD04/hAfTUU23uVBNBfLAPcfuv3CntLthxHOgHafXg2TpVy25YQF7 a+ecGWLxTPr5ZcoPHiIrNIYr1Ht/5XqVwgHb3HjCtDUHNaqpiHKfq9sKxfMqeBWsPlUH QWVABbX8ylSWxffaRQgFWun6iIZ0tla4yNkve4WG3Xc+wWoAagGXpH8VxLHoV9YvqtDv VR/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=IgGRhmQAV8l/ejNVJCkuV0JAjB7poESHWXmqcIQ0wvQ=; b=afhjH6Im6m/uWwdkiX1fw9PvWZykuCy71lRLIKComSiRhjQh4ITgNO7kZ0rgVgi3Q6 0bTm09HSry1oUHG3bAz8AzDB3IlN3Kui/RGPXPUF6SzES3FJl3uBE4OVAPuRqzmF1Tez 1qmV60QZ2iDOUKxEOmau0VudxeXWDbHFcSpwQuF37k3XjAnBWNShkVHT5K34plwQKtSb K8d0M+V/2B0PNyYHTyklC/QG7lEhTYxeNfRhp8ls3zdVPU0o9KdkXJsg/7HLEoVvBLST GhQmc4HejGlsg6HW+VRSP5LS0hKkV8UbffwBs90lm4yO+rnNXqSd/CaxDRIUUuyJBfwy 8Gdw== X-Gm-Message-State: ABUngvcWf0O/LBedJN/0lzhzCtxClpzthjmbwH6y0dYUl9w6IGOVnRU5QXAk74wpZbp+8w== X-Received: by 10.25.202.73 with SMTP id h9mr3981002lfj.8.1478205601699; Thu, 03 Nov 2016 13:40:01 -0700 (PDT) Received: from localhost (mobile-access-bcee98-78.dhcp.inet.fi. [188.238.152.78]) by smtp.gmail.com with ESMTPSA id w67sm1701421lff.16.2016.11.03.13.40.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Nov 2016 13:40:01 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 5/8] notmuch.desktop: move under emacs as notmuch-emacs-mua.desktop Date: Thu, 3 Nov 2016 22:37:58 +0200 Message-Id: <2404ce7cdec7f32825d9c6e55750a0141f95a2df.1478205331.git.jani@nikula.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Nov 2016 20:40:06 -0000 The notmuch.desktop file is part of notmuch-emacs. Move it under emacs, and rename as notmuch-emacs-mua.desktop to reflect this. --- Makefile.local | 5 ----- emacs/Makefile.local | 6 ++++++ notmuch.desktop => emacs/notmuch-emacs-mua.desktop | 0 3 files changed, 6 insertions(+), 5 deletions(-) rename notmuch.desktop => emacs/notmuch-emacs-mua.desktop (100%) diff --git a/Makefile.local b/Makefile.local index d1b0585f2866..a9998d5b6890 100644 --- a/Makefile.local +++ b/Makefile.local @@ -333,11 +333,6 @@ ifeq ($(WITH_EMACS), 1) endif endif -.PHONY: install-desktop -install-desktop: - mkdir -p "$(DESTDIR)$(desktop_dir)" - desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" notmuch.desktop - SRCS := $(SRCS) $(notmuch_client_srcs) CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp diff --git a/emacs/Makefile.local b/emacs/Makefile.local index 56b9714d91d7..76ba974c4065 100644 --- a/emacs/Makefile.local +++ b/emacs/Makefile.local @@ -28,6 +28,7 @@ $(dir)/notmuch-version.el: $(srcdir)/$(dir)/notmuch-version.el.tmpl -e 's/%VERSION%/"$(VERSION)"/' $< > $@ emacs_mua := $(dir)/notmuch-emacs-mua +emacs_mua_desktop := $(dir)/notmuch-emacs-mua.desktop emacs_images := \ $(srcdir)/$(dir)/notmuch-logo.png @@ -87,4 +88,9 @@ endif mkdir -p "$(DESTDIR)$(prefix)/bin/" install $(emacs_mua) "$(DESTDIR)$(prefix)/bin" +.PHONY: install-desktop +install-desktop: + mkdir -p "$(DESTDIR)$(desktop_dir)" + desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" $(emacs_mua_desktop) + CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el diff --git a/notmuch.desktop b/emacs/notmuch-emacs-mua.desktop similarity index 100% rename from notmuch.desktop rename to emacs/notmuch-emacs-mua.desktop -- 2.1.4