From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#12536: 24.2.50; Outdated emacs22 icons in repo Date: Mon, 15 Oct 2012 19:57:39 -0400 Message-ID: References: <87626xkay8.fsf@neutrico.pl> <50663D21.1010208@neutrico.pl> <507222FF.2040701@harpegolden.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1350345478 27829 80.91.229.3 (15 Oct 2012 23:57:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 15 Oct 2012 23:57:58 +0000 (UTC) Cc: 12536@debbugs.gnu.org To: David De La Harpe Golden Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Oct 16 01:58:05 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TNuXs-0005ie-7D for geb-bug-gnu-emacs@m.gmane.org; Tue, 16 Oct 2012 01:58:04 +0200 Original-Received: from localhost ([::1]:60788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNuXl-0005s7-Em for geb-bug-gnu-emacs@m.gmane.org; Mon, 15 Oct 2012 19:57:57 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:47117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNuXi-0005rr-FX for bug-gnu-emacs@gnu.org; Mon, 15 Oct 2012 19:57:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TNuXh-0000dZ-BX for bug-gnu-emacs@gnu.org; Mon, 15 Oct 2012 19:57:54 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35618) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNuXh-0000dV-7X for bug-gnu-emacs@gnu.org; Mon, 15 Oct 2012 19:57:53 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1TNuYn-0006gM-Sz for bug-gnu-emacs@gnu.org; Mon, 15 Oct 2012 19:59:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 15 Oct 2012 23:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12536 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 12536-submit@debbugs.gnu.org id=B12536.135034553625675 (code B ref 12536); Mon, 15 Oct 2012 23:59:01 +0000 Original-Received: (at 12536) by debbugs.gnu.org; 15 Oct 2012 23:58:56 +0000 Original-Received: from localhost ([127.0.0.1]:45869 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TNuYg-0006g3-42 for submit@debbugs.gnu.org; Mon, 15 Oct 2012 19:58:55 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:54095 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TNuYc-0006fv-SC for 12536@debbugs.gnu.org; Mon, 15 Oct 2012 19:58:52 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1TNuXT-0002j3-Vl; Mon, 15 Oct 2012 19:57:40 -0400 X-Spook: constitution Capricorn CESID North Korea HAMASMOIS IRA X-Ran: YDLP;ijcfU4|~UVz\OIR}t)p{Jtx{zXa6?3C/zr(3}y|GIn7=cH`@mH"Fdx7ZAjO.X;-um X-Hue: blue X-Attribution: GM In-Reply-To: <507222FF.2040701@harpegolden.net> (David De La Harpe Golden's message of "Mon, 08 Oct 2012 01:49:03 +0100") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:65651 Archived-At: David De La Harpe Golden wrote: > Well, I've used the emacs22 icon since the change, but I suppose I am > fully capable of keeping my own copy if I want it. Or I could use the > new emacs icon if I just changed iceweasel etc. instead, just so long > as I don't have to juggle quite so many blue crystal spheres, > grumble... It's trivial (one-line patch) to put back the emacs22 icons, just not install them. It's only fractionally less trivial (three-line patch) to also allow choice of icon at install time: *** Makefile.in 2012-10-15 21:57:20 +0000 --- Makefile.in 2012-10-15 23:54:13 +0000 *************** *** 631,636 **** --- 631,640 ---- done ## Install those items from etc/ that need to end up elsewhere. + + ## Choose "emacs" or "emacs22" at installation time. + ## Note: emacs22 does not have all the resolutions. + EMACS_ICON=emacs install-etc: umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir} dest=`echo emacs | sed '$(TRANSFORM)'`; \ *************** *** 645,653 **** for dir in */*/apps */*/mimetypes; do \ [ -d $${dir} ] || continue ; \ ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \ ! for icon in $${dir}/*.*; do \ [ -r $${icon} ] || continue ; \ ! dest=`echo "$${icon}" | sed -e 's|.*/||' -e '$(TRANSFORM)'` ; \ ( cd $${thisdir}; \ ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dir}/$${dest} ) \ || exit 1; \ --- 649,657 ---- for dir in */*/apps */*/mimetypes; do \ [ -d $${dir} ] || continue ; \ ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \ ! for icon in $${dir}/${EMACS_ICON}[.-]*; do \ [ -r $${icon} ] || continue ; \ ! dest=`echo "$${icon}" | sed -e 's|.*/||' -e 's/$(EMACS_ICON)/emacs/' -e '$(TRANSFORM)'` ; \ ( cd $${thisdir}; \ ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dir}/$${dest} ) \ || exit 1; \