public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/emacs-tools:emacs-common-gentoo commit in: icons/, /
@ 2012-05-06 16:06 Sebastian Pipping
  0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     4631697e0e3a9ec220e7dd1acdc2155118ba4ac0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  5 19:26:13 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr  5 19:26:13 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=4631697e

Add some new icon files, and move all icons to a subdirectory.

svn path=/emacs-common-gentoo/; revision=1242

---
 ChangeLog                             |   18 +++++++++++++++++-
 Makefile                              |   10 +++++++---
 gnured_48.png                         |  Bin 1636 -> 0 bytes
 README.icons => icons/COPYRIGHT.icons |   20 +++++++++++++-------
 emacs.png => icons/emacs.png          |  Bin 4443 -> 4443 bytes
 icons/emacs23_128.png                 |  Bin 0 -> 18829 bytes
 icons/emacs23_16.png                  |  Bin 0 -> 1003 bytes
 icons/emacs23_24.png                  |  Bin 0 -> 1455 bytes
 icons/emacs23_32.png                  |  Bin 0 -> 2522 bytes
 icons/emacs23_48.png                  |  Bin 0 -> 4583 bytes
 emacs_16.png => icons/emacs_16.png    |  Bin 614 -> 614 bytes
 emacs_24.png => icons/emacs_24.png    |  Bin 802 -> 802 bytes
 emacs_32.png => icons/emacs_32.png    |  Bin 2217 -> 2217 bytes
 emacs_48.png => icons/emacs_48.png    |  Bin 3082 -> 3082 bytes
 icons/sink.png                        |  Bin 0 -> 306 bytes
 15 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b76f054..fc7aea5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2009-04-05  Ulrich Mueller  <ulm@gentoo.org>
+
+	* icons/emacs.png, icons/emacs_16.png, icons/emacs_24.png:
+	* icons/emacs_32.png, icons/emacs_48.png: Moved to subdirectory.
+	* icons/emacs23_16.png, icons/emacs23_24.png:
+	* icons/emacs23_32.png, icons/emacs23_48.png:
+	* icons/emacs23_128.png: New files, taken from Emacs 23.0.92,
+	optimised with OptiPNG.
+	* icons/sink.png: New file, converted from sink.h of Emacs 18.41.
+	* gnured_48.png: File removed.
+	* icons/COPYRIGHT.icons: Renamed from README.icons and updated.
+
+	* Makefile: Change licence from GPL v2 only to GPL v2 or later.
+	(ICONFILES): New variable.
+	(DISTFILES): Update.
+
 2009-03-07  Ulrich Mueller  <ulm@gentoo.org>
 
 	* Version 1.0 released.
@@ -78,4 +94,4 @@
 	* emacs.desktop, emacs.png: New files.
 
 Copyright 2007-2009 Gentoo Foundation
-Distributed under the terms of the GNU General Public License v2
+Distributed under the terms of the GNU General Public License v2 or later

diff --git a/Makefile b/Makefile
index 911e2e8..cf4c963 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Copyright 2007-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
+# Distributed under the terms of the GNU General Public License v2 or later
 
 PN = emacs-common-gentoo
 PV = $(shell sed '/^[ \t]*\* [Vv]ersion/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' \
@@ -7,8 +7,12 @@ PV = $(shell sed '/^[ \t]*\* [Vv]ersion/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' \
 P = $(PN)-$(PV)
 
 DESKTOPFILES = emacs.desktop emacsclient.desktop
-DISTFILES = subdirs.el $(DESKTOPFILES) README.icons emacs.png \
-	emacs_16.png emacs_24.png emacs_32.png emacs_48.png gnured_48.png
+ICONFILES = emacs.png sink.png \
+	emacs_16.png emacs_24.png emacs_32.png emacs_48.png \
+	emacs23_16.png emacs23_24.png emacs23_32.png emacs23_48.png \
+	emacs23_128.png
+DISTFILES = subdirs.el $(DESKTOPFILES) \
+	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES))
 
 
 .PHONY: all dist clean $(DESKTOPFILES)

diff --git a/gnured_48.png b/gnured_48.png
deleted file mode 100644
index 1d34323..0000000
Binary files a/gnured_48.png and /dev/null differ

diff --git a/README.icons b/icons/COPYRIGHT.icons
similarity index 50%
rename from README.icons
rename to icons/COPYRIGHT.icons
index 9d5dbbb..88586c0 100644
--- a/README.icons
+++ b/icons/COPYRIGHT.icons
@@ -1,5 +1,11 @@
 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
+File: sink.png
+  Taken from Emacs 18.41 (sink.h)
+  Author: ?
+  Published in 1987 without copyright notice
+  License: public domain
+
 File: emacs.png
   Taken from GNOME (gnome-emacs.png)
   Authors: Garrett LeSage <garrett@linux.com>
@@ -7,14 +13,14 @@ File: emacs.png
   License: GNU General Public License version 2 or later
 
 Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png
-  Taken from Emacs 22
+  Taken from Emacs 22.1
   Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
   Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
   License: GNU General Public License version 2 or later
 
-File: gnured_48.png
-  Based on splash.xpm from Emacs 22
-  Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-    Free Software Foundation, Inc.
-  License: GNU General Public License version 2 or later
+Files: emacs23_16.png emacs23_24.png emacs23_32.png emacs23_48.png
+       emacs23_128.png
+  Taken from Emacs 23.0.92 (and run through OptiPNG)
+  Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
+  Copyright (C) 2007, 2008, 2009  Free Software Foundation, Inc.
+  License: GNU General Public License version 3 or later

diff --git a/emacs.png b/icons/emacs.png
similarity index 100%
rename from emacs.png
rename to icons/emacs.png

diff --git a/icons/emacs23_128.png b/icons/emacs23_128.png
new file mode 100644
index 0000000..1968cf4
Binary files /dev/null and b/icons/emacs23_128.png differ

diff --git a/icons/emacs23_16.png b/icons/emacs23_16.png
new file mode 100644
index 0000000..48280fe
Binary files /dev/null and b/icons/emacs23_16.png differ

diff --git a/icons/emacs23_24.png b/icons/emacs23_24.png
new file mode 100644
index 0000000..9098253
Binary files /dev/null and b/icons/emacs23_24.png differ

diff --git a/icons/emacs23_32.png b/icons/emacs23_32.png
new file mode 100644
index 0000000..3840be5
Binary files /dev/null and b/icons/emacs23_32.png differ

diff --git a/icons/emacs23_48.png b/icons/emacs23_48.png
new file mode 100644
index 0000000..1c67855
Binary files /dev/null and b/icons/emacs23_48.png differ

diff --git a/emacs_16.png b/icons/emacs_16.png
similarity index 100%
rename from emacs_16.png
rename to icons/emacs_16.png

diff --git a/emacs_24.png b/icons/emacs_24.png
similarity index 100%
rename from emacs_24.png
rename to icons/emacs_24.png

diff --git a/emacs_32.png b/icons/emacs_32.png
similarity index 100%
rename from emacs_32.png
rename to icons/emacs_32.png

diff --git a/emacs_48.png b/icons/emacs_48.png
similarity index 100%
rename from emacs_48.png
rename to icons/emacs_48.png

diff --git a/icons/sink.png b/icons/sink.png
new file mode 100644
index 0000000..687528a
Binary files /dev/null and b/icons/sink.png differ



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/emacs-tools:emacs-common-gentoo commit in: icons/, /
@ 2012-05-06 16:06 Sebastian Pipping
  0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     4ce8cd9850ddc56c42f12e43a4f097396f7e7f7c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 15:57:01 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 15:57:01 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=4ce8cd98

SVG icon from Emacs CVS trunk.

svn path=/emacs-common-gentoo/; revision=1248

---
 ChangeLog             |    6 +
 Makefile              |    2 +-
 icons/COPYRIGHT.icons |    7 +
 icons/emacs23.svg     |  296 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 310 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 848afb6..8e9f0a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-12  Ulrich Mueller  <ulm@gentoo.org>
+
+	* icons/emacs23.svg: New file, SVG icon from Emacs CVS trunk.
+	* icons/COPYRIGHT.icons: Update.
+	* Makefile (ICONFILES): Update.
+
 2009-04-10  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs.desktop (StartupWMClass): Key added.

diff --git a/Makefile b/Makefile
index cf4c963..031b650 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ DESKTOPFILES = emacs.desktop emacsclient.desktop
 ICONFILES = emacs.png sink.png \
 	emacs_16.png emacs_24.png emacs_32.png emacs_48.png \
 	emacs23_16.png emacs23_24.png emacs23_32.png emacs23_48.png \
-	emacs23_128.png
+	emacs23_128.png emacs23.svg
 DISTFILES = subdirs.el $(DESKTOPFILES) \
 	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES))
 

diff --git a/icons/COPYRIGHT.icons b/icons/COPYRIGHT.icons
index 88586c0..c92a540 100644
--- a/icons/COPYRIGHT.icons
+++ b/icons/COPYRIGHT.icons
@@ -24,3 +24,10 @@ Files: emacs23_16.png emacs23_24.png emacs23_32.png emacs23_48.png
   Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
   Copyright (C) 2007, 2008, 2009  Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later
+
+File: emacs23.svg
+  Taken from Emacs CVS trunk at 2009-04-12
+  Authors: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
+           Chong Yidong <cyd@stupidchicken.com>
+  Copyright (C) 2008, 2009  Free Software Foundation, Inc.
+  License: GNU General Public License version 3 or later

diff --git a/icons/emacs23.svg b/icons/emacs23.svg
new file mode 100644
index 0000000..5e9c749
--- /dev/null
+++ b/icons/emacs23.svg
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Gnu Emacs Icon
+
+   Copyright (C) 2008, 2009
+   Free Software Foundation, Inc.
+
+   This file is part of GNU Emacs.
+
+   GNU Emacs is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   GNU Emacs is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="512"
+   height="512"
+   viewBox="0.171 0.201 512 512"
+   id="svg4768"
+   xml:space="preserve">
+<defs
+   id="defs4770"><linearGradient
+   id="linearGradient3294"><stop
+     id="stop3296"
+     style="stop-color:#6376e6;stop-opacity:1"
+     offset="0" /><stop
+     id="stop3302"
+     style="stop-color:#222989;stop-opacity:1"
+     offset="0.50094414" /><stop
+     id="stop3298"
+     style="stop-color:#00003d;stop-opacity:1"
+     offset="1" /></linearGradient><linearGradient
+   id="linearGradient3284"><stop
+     id="stop3286"
+     style="stop-color:#000000;stop-opacity:1"
+     offset="0" /><stop
+     id="stop3292"
+     style="stop-color:#000000;stop-opacity:0.49803922"
+     offset="0.84845906" /><stop
+     id="stop3288"
+     style="stop-color:#000000;stop-opacity:0"
+     offset="1" /></linearGradient><linearGradient
+   id="linearGradient3274"><stop
+     id="stop3276"
+     style="stop-color:#000000;stop-opacity:1"
+     offset="0" /><stop
+     id="stop3278"
+     style="stop-color:#000000;stop-opacity:0"
+     offset="1" /></linearGradient><linearGradient
+   id="linearGradient3262"><stop
+     id="stop3264"
+     style="stop-color:#000000;stop-opacity:1"
+     offset="0" /><stop
+     id="stop3266"
+     style="stop-color:#000000;stop-opacity:0"
+     offset="1" /></linearGradient><linearGradient
+   id="linearGradient3242"><stop
+     id="stop3244"
+     style="stop-color:#282828;stop-opacity:1"
+     offset="0" /><stop
+     id="stop3252"
+     style="stop-color:#808080;stop-opacity:1"
+     offset="0.39253417" /><stop
+     id="stop3246"
+     style="stop-color:#d9d9d9;stop-opacity:1"
+     offset="1" /></linearGradient><linearGradient
+   id="linearGradient3202"><stop
+     id="stop3204"
+     style="stop-color:#2b2b2b;stop-opacity:1"
+     offset="0" /><stop
+     id="stop3250"
+     style="stop-color:#828383;stop-opacity:1"
+     offset="0.5" /><stop
+     id="stop3206"
+     style="stop-color:#dadbdb;stop-opacity:1"
+     offset="1" /></linearGradient><linearGradient
+   id="linearGradient4966"><stop
+     id="stop4968"
+     style="stop-color:#b6b3d8;stop-opacity:1"
+     offset="0" /><stop
+     id="stop4970"
+     style="stop-color:#b6b3d8;stop-opacity:0"
+     offset="1" /></linearGradient><linearGradient
+   id="linearGradient4938"><stop
+     id="stop4940"
+     style="stop-color:#000000;stop-opacity:1"
+     offset="0" /><stop
+     id="stop4942"
+     style="stop-color:#000000;stop-opacity:0"
+     offset="1" /></linearGradient><linearGradient
+   id="linearGradient4898"><stop
+     id="stop4900"
+     style="stop-color:#bab8db;stop-opacity:1"
+     offset="0" /><stop
+     id="stop4902"
+     style="stop-color:#5955a9;stop-opacity:0.99159664"
+     offset="1" /></linearGradient><linearGradient
+   id="linearGradient4876"><stop
+     id="stop4878"
+     style="stop-color:#d3d2e8;stop-opacity:1"
+     offset="0" /><stop
+     id="stop4880"
+     style="stop-color:#5955a9;stop-opacity:0.99159664"
+     offset="1" /></linearGradient>
+<radialGradient
+   cx="20.951529"
+   cy="-108.96888"
+   r="266.76535"
+   fx="20.951529"
+   fy="-108.96888"
+   id="radialGradient4892"
+   xlink:href="#linearGradient4898"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.6817439,0,0,0.5905355,-3.8523706,-28.935273)" /><radialGradient
+   cx="233.8876"
+   cy="471.26172"
+   r="170.49393"
+   fx="233.8876"
+   fy="471.26172"
+   id="radialGradient4944"
+   xlink:href="#linearGradient4938"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(1,0,0,0.1854103,0,383.88493)" /><radialGradient
+   cx="299.70135"
+   cy="371.76376"
+   r="76.696358"
+   fx="299.70135"
+   fy="371.76376"
+   id="radialGradient4972"
+   xlink:href="#linearGradient4966"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(1,0,0,0.9121621,0,32.654948)" /><radialGradient
+   cx="289.44067"
+   cy="390.45248"
+   r="17.67668"
+   fx="289.44067"
+   fy="390.45248"
+   id="radialGradient3210"
+   xlink:href="#linearGradient3202"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.414705,0.3300575,-0.5059004,0.6356454,346.95314,49.479585)" /><radialGradient
+   cx="283.50717"
+   cy="382.14804"
+   r="17.67668"
+   fx="283.50717"
+   fy="382.14804"
+   id="radialGradient3238"
+   xlink:href="#linearGradient3202"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.414705,0.3300575,-0.5059004,0.6356454,448.41009,-65.398074)" /><radialGradient
+   cx="418.45551"
+   cy="181.18982"
+   r="63.068935"
+   fx="418.45551"
+   fy="181.18982"
+   id="radialGradient3248"
+   xlink:href="#linearGradient3242"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(-6.5565014e-2,-5.9721765e-2,1.6871024,-1.8521705,171.90774,540.51473)" /><radialGradient
+   cx="354.51709"
+   cy="357.33591"
+   r="33.712105"
+   fx="354.51709"
+   fy="357.33591"
+   id="radialGradient3268"
+   xlink:href="#linearGradient3262"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.4055116,-3.3440123e-2,0.1034174,4.3988695,177.23251,-1191.6649)" /><radialGradient
+   cx="510.58469"
+   cy="223.55537"
+   r="132.28336"
+   fx="510.58469"
+   fy="223.55537"
+   id="radialGradient3280"
+   xlink:href="#linearGradient3274"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(-0.1339874,-0.1146812,0.3079048,-0.3597394,444.23592,395.03849)" /><radialGradient
+   cx="284.4671"
+   cy="-158.17821"
+   r="110.2972"
+   fx="284.4671"
+   fy="-158.17821"
+   id="radialGradient3290"
+   xlink:href="#linearGradient3284"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(-1.2497569,1.3798305,-9.6289463e-2,-7.2974479e-2,674.3826,-70.590682)" /><radialGradient
+   cx="425.51019"
+   cy="356.62274"
+   r="143.34167"
+   fx="425.51019"
+   fy="356.62274"
+   id="radialGradient3300"
+   xlink:href="#linearGradient3294"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(-0.1008165,-8.0872321e-2,1.0745309,-1.3395252,13.843287,784.79288)" /></defs>
+<path
+   d="M 404.38153,471.26172 A 170.49393,31.611336 0 1 1 63.393677,471.26172 A 170.49393,31.611336 0 1 1 404.38153,471.26172 z"
+   transform="matrix(1.3434649,0,0,1.3934426,-81.886873,-193.70595)"
+   id="path4912"
+   style="opacity:1;fill:url(#radialGradient4944);fill-opacity:1;stroke:#7b0000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+   d="M 277.19656,7.985198 A 266.76535,284.35425 0 1 1 -256.33414,7.985198 A 266.76535,284.35425 0 1 1 277.19656,7.985198 z"
+   transform="matrix(0.8855031,0,0,0.8392166,227.80221,232.6491)"
+   id="path4864"
+   style="opacity:1;fill:url(#radialGradient4892);fill-opacity:1;stroke:#7b0000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+   d="M 376.39771,371.76376 A 76.696358,69.959511 0 1 1 223.005,371.76376 A 76.696358,69.959511 0 1 1 376.39771,371.76376 z"
+   transform="matrix(1.4594595,0,0,1,-195.74111,-13.473684)"
+   id="path4946"
+   style="opacity:1;fill:url(#radialGradient4972);fill-opacity:1;stroke:#7b0000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+   d="M 120.52728,395.60181 C 120.52728,395.60181 141.53508,401.7017 169.49894,405.18885 C 180.82361,406.60106 223.91189,411.53703 256.94833,411.40748 C 256.94833,411.40748 297.18385,411.45315 319.39367,408.29817 C 342.63265,404.99699 355.79853,400.78399 363.12576,392.37646 C 363.31663,390.37182 366.66239,383.83735 357.62922,377.53581 C 334.53496,361.42524 304.67924,357.01539 246.68812,343.24332 C 182.56112,327.12062 163.39684,311.68183 153.82282,300.50869 C 144.74597,289.31078 155.52664,266.05486 207.19934,254.64634 C 233.36175,248.27975 330.80211,247.10994 330.80211,247.10994 C 302.84706,224.91525 250.36452,185.17927 239.63685,176.72892 C 230.22819,169.31758 215.0665,157.94409 213.43669,147.7805 C 211.23808,137.88672 226.81161,133.12305 235.05641,132.5734 C 261.62302,130.74122 297.90017,133.85593 330.14653,140.26856 C 346.35535,143.49191 349.20119,143.01683 349.20119,143.01683 C 372.28666,144.11614 390.24202,132.02376 389.32593,106.55645 C 389.14271,80.722724 363.3136,60.0
 07847 334.72698,59.103006 C 307.8068,58.250912 241.46904,62.950582 241.46904,62.950582 C 318.78702,78.890545 331.42676,82.958326 335.45985,92.265455 C 337.84168,97.761995 331.48115,103.22697 310.17577,102.15922 C 286.98088,100.99677 239.45364,95.38016 239.45364,95.38016 C 194.19881,88.417878 162.68532,81.822031 148.94397,99.777391 C 139.96658,111.50786 150.2265,125.79434 154.25729,134.22236 C 172.21266,165.55264 203.26114,187.04759 222.96403,202.19623 C 230.37744,207.89605 253.01177,220.51802 253.01177,220.51802 C 182.65608,201.28013 126.59139,212.08999 91.047104,230.77822 C 50.1895,254.96299 57.178586,295.77502 122.01094,333.92994 C 160.30349,356.46574 179.36948,367.29179 242.06631,374.98916 C 278.71351,380.83258 284.17422,383.22354 283.8957,386.27387 C 283.50356,390.56845 240.52009,392.19591 228.70541,393.01072 C 198.64873,395.08359 120.91594,395.60181 120.52728,395.60181 z"
+   id="path4839"
+   style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><rect
+   width="512"
+   height="512"
+   x="0.171"
+   y="0.20100001"
+   id="rect4772"
+   style="fill:none;display:none" />
+
+
+
+<g
+   id="g4788"
+   style="display:none">
+	<g
+   id="g4790"
+   style="display:inline">
+	</g>
+</g>
+
+
+<g
+   id="g4806"
+   style="display:none">
+	<g
+   id="g4808"
+   style="display:inline">
+		<path
+   d="M 349.098,256.651 C 348.833,256.397 386.735,284.256 388.519,281.663 C 394.881,272.411 470.565,188.526 473.303,165.427 C 473.545,163.424 472.787,161.331 472.787,161.331 C 472.787,161.331 471.597,161.187 466.462,157.017 C 463.77,154.825 460.979,152.436 460.979,152.436 C 444.925,153.434 403.094,193.995 349.917,256.004"
+   id="path4810"
+   style="fill:#050505;display:none" />
+	</g>
+</g>
+
+
+
+<g
+   id="g4796"
+   style="stroke:none">
+
+	<g
+   id="g4800"
+   style="stroke:none">
+
+	</g>
+</g><g
+   id="g4820">
+
+	<path
+   d="M 279.476,404.243 C 279.469,404.239 272.03,400.131 262.672,392.842 L 262.672,392.842 C 254.59,386.557 249.134,380.628 249.128,380.622 L 249.128,380.622 L 249.006,380.489 L 252.652,375.82 L 252.809,375.615 L 252.978,375.812 C 252.995,375.822 258.378,382.107 266.703,388.592 L 266.703,388.592 C 274.616,394.749 283.297,399.178 283.315,399.187 L 283.315,399.187 L 283.544,399.304 L 279.633,404.33 L 279.476,404.243 L 279.476,404.243 z M 262.934,392.506 C 271.479,399.162 278.403,403.15 279.523,403.781 L 279.523,403.781 L 282.895,399.447 C 281.472,398.704 273.642,394.528 266.442,388.926 L 266.442,388.926 C 258.938,383.081 253.805,377.393 252.828,376.281 L 252.828,376.281 L 249.564,380.465 C 250.413,381.37 255.574,386.785 262.934,392.506 L 262.934,392.506 z"
+   id="path4824"
+   style="fill:#4d4d4d" />
+</g><g
+   id="g4774">
+
+</g><rect
+   width="378.89471"
+   height="389.88782"
+   x="129.8893"
+   y="112.05299"
+   id="rect3282"
+   style="opacity:1;fill:url(#radialGradient3290);fill-opacity:1;stroke:#4a4a4a;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+   d="M 279.41935,402.42925 C 279.41935,402.42925 332.64609,345.32574 384.74548,282.44569 L 387.0212,283.14836 C 387.0212,283.14836 495.06978,164.73541 468.64063,155.14837 C 468.64063,155.14837 455.42606,128.97833 351.78234,254.90545 L 351.58303,256.79518 C 303.76315,311.94378 250.62994,379.18477 250.62994,379.18477 C 209.58912,438.18094 185.22113,481.78682 187.23653,486.00083 C 189.97605,491.72893 279.57838,403.0031 279.41935,402.42925 z"
+   id="path3254"
+   style="fill:url(#radialGradient3300);fill-opacity:1;fill-rule:evenodd;stroke:#000030;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+   d="M 248.88937,380.28407 C 260.52371,392.19325 279.48677,404.28563 279.48677,404.28563 L 283.24273,399.52196 C 270.37465,392.79686 252.46212,375.70363 252.46212,375.70363 L 248.88937,380.28407 z"
+   id="path2430"
+   style="fill:url(#radialGradient3210);fill-opacity:1;fill-rule:evenodd;stroke:#606060;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+   d="M 349.52184,256.42873 C 370.04225,269.52883 386.16543,285.37718 386.16543,285.37718 L 388.91369,282.17086 C 377.9694,270.59048 352.22755,253.07064 352.22755,253.07064 L 349.52184,256.42873 z"
+   id="path3236"
+   style="fill:url(#radialGradient3238);fill-opacity:1;fill-rule:evenodd;stroke:#606060;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+   d="M 462.24667,151.81129 C 473.05653,152.72737 474.88872,162.25471 474.88872,162.25471 C 425.60308,213.55574 353.41521,288.12545 353.41521,288.12545 L 349.75085,285.01074 C 413.32748,208.79208 462.24667,151.81129 462.24667,151.81129"
+   id="path3240"
+   style="fill:url(#radialGradient3248);fill-opacity:1;fill-rule:evenodd;stroke:#4a4a4a;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></svg>



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/emacs-tools:emacs-common-gentoo commit in: icons/, /
@ 2012-05-06 16:06 Sebastian Pipping
  0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     31fcd4181650086585e1ba3026efcec5f96c071e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  8 09:58:44 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 09:58:44 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=31fcd418

Rename icon files following release of Emacs 23.

svn path=/emacs-common-gentoo/; revision=1339

---
 ChangeLog                                |    8 ++++++++
 Makefile                                 |    8 ++++----
 icons/COPYRIGHT.icons                    |   15 +++++++--------
 icons/{emacs23.svg => emacs.svg}         |    0
 icons/{emacs_16.png => emacs22_16.png}   |  Bin 614 -> 614 bytes
 icons/{emacs_24.png => emacs22_24.png}   |  Bin 802 -> 802 bytes
 icons/{emacs_32.png => emacs22_32.png}   |  Bin 2217 -> 2217 bytes
 icons/{emacs_48.png => emacs22_48.png}   |  Bin 3082 -> 3082 bytes
 icons/emacs23_16.png                     |  Bin 1003 -> 0 bytes
 icons/emacs23_24.png                     |  Bin 1455 -> 0 bytes
 icons/emacs23_32.png                     |  Bin 2522 -> 0 bytes
 icons/emacs23_48.png                     |  Bin 4583 -> 0 bytes
 icons/{emacs23_128.png => emacs_128.png} |  Bin 18829 -> 18829 bytes
 icons/emacs_16.png                       |  Bin 614 -> 1003 bytes
 icons/emacs_24.png                       |  Bin 802 -> 1455 bytes
 icons/emacs_32.png                       |  Bin 2217 -> 2522 bytes
 icons/emacs_48.png                       |  Bin 3082 -> 4583 bytes
 icons/{emacs.png => gnome-emacs.png}     |  Bin 4443 -> 4443 bytes
 18 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0dead0a..06d6ca0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-08  Ulrich Mueller  <ulm@gentoo.org>
+
+	* icons/emacs22_*.png, icons/emacs_*.png, icons/gnone-emacs.png:
+	Renamed from emacs_*.png, emacs23_*.png, and emacs.png,
+	respectively. New default following release of Emacs 23.
+	* icons/COPYRIGHT.icons: Update.
+	* Makefile (ICONFILES): Update.
+
 2009-07-11  Ulrich Mueller  <ulm@gentoo.org>
 
 	* icons/emacs23.svg: Update from Emacs CVS.

diff --git a/Makefile b/Makefile
index 031b650..30694b6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,10 @@ PV = $(shell sed '/^[ \t]*\* [Vv]ersion/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' \
 P = $(PN)-$(PV)
 
 DESKTOPFILES = emacs.desktop emacsclient.desktop
-ICONFILES = emacs.png sink.png \
-	emacs_16.png emacs_24.png emacs_32.png emacs_48.png \
-	emacs23_16.png emacs23_24.png emacs23_32.png emacs23_48.png \
-	emacs23_128.png emacs23.svg
+ICONFILES = gnome-emacs.png sink.png \
+	emacs22_16.png emacs22_24.png emacs22_32.png emacs22_48.png \
+	emacs_16.png emacs_24.png emacs_32.png emacs_48.png emacs_128.png \
+	emacs.svg
 DISTFILES = subdirs.el $(DESKTOPFILES) \
 	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES))
 

diff --git a/icons/COPYRIGHT.icons b/icons/COPYRIGHT.icons
index c92a540..a3238e7 100644
--- a/icons/COPYRIGHT.icons
+++ b/icons/COPYRIGHT.icons
@@ -6,27 +6,26 @@ File: sink.png
   Published in 1987 without copyright notice
   License: public domain
 
-File: emacs.png
-  Taken from GNOME (gnome-emacs.png)
+File: gnome-emacs.png
+  Taken from GNOME
   Authors: Garrett LeSage <garrett@linux.com>
            Tuomas Kuosmanen <tigert@gimp.org>
   License: GNU General Public License version 2 or later
 
-Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png
+Files: emacs22_16.png emacs22_24.png emacs22_32.png emacs22_48.png
   Taken from Emacs 22.1
   Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
   Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
   License: GNU General Public License version 2 or later
 
-Files: emacs23_16.png emacs23_24.png emacs23_32.png emacs23_48.png
-       emacs23_128.png
-  Taken from Emacs 23.0.92 (and run through OptiPNG)
+Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png emacs_128.png
+  Taken from Emacs 23.1 (and run through OptiPNG)
   Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
   Copyright (C) 2007, 2008, 2009  Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later
 
-File: emacs23.svg
-  Taken from Emacs CVS trunk at 2009-04-12
+File: emacs.svg
+  Taken from Emacs 23.1
   Authors: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
            Chong Yidong <cyd@stupidchicken.com>
   Copyright (C) 2008, 2009  Free Software Foundation, Inc.

diff --git a/icons/emacs23.svg b/icons/emacs.svg
similarity index 100%
rename from icons/emacs23.svg
rename to icons/emacs.svg

diff --git a/icons/emacs_16.png b/icons/emacs22_16.png
similarity index 100%
copy from icons/emacs_16.png
copy to icons/emacs22_16.png

diff --git a/icons/emacs_24.png b/icons/emacs22_24.png
similarity index 100%
copy from icons/emacs_24.png
copy to icons/emacs22_24.png

diff --git a/icons/emacs_32.png b/icons/emacs22_32.png
similarity index 100%
copy from icons/emacs_32.png
copy to icons/emacs22_32.png

diff --git a/icons/emacs_48.png b/icons/emacs22_48.png
similarity index 100%
copy from icons/emacs_48.png
copy to icons/emacs22_48.png

diff --git a/icons/emacs23_16.png b/icons/emacs23_16.png
deleted file mode 100644
index 48280fe..0000000
Binary files a/icons/emacs23_16.png and /dev/null differ

diff --git a/icons/emacs23_24.png b/icons/emacs23_24.png
deleted file mode 100644
index 9098253..0000000
Binary files a/icons/emacs23_24.png and /dev/null differ

diff --git a/icons/emacs23_32.png b/icons/emacs23_32.png
deleted file mode 100644
index 3840be5..0000000
Binary files a/icons/emacs23_32.png and /dev/null differ

diff --git a/icons/emacs23_48.png b/icons/emacs23_48.png
deleted file mode 100644
index 1c67855..0000000
Binary files a/icons/emacs23_48.png and /dev/null differ

diff --git a/icons/emacs23_128.png b/icons/emacs_128.png
similarity index 100%
rename from icons/emacs23_128.png
rename to icons/emacs_128.png

diff --git a/icons/emacs_16.png b/icons/emacs_16.png
index ddc9c1e..48280fe 100644
Binary files a/icons/emacs_16.png and b/icons/emacs_16.png differ

diff --git a/icons/emacs_24.png b/icons/emacs_24.png
index 091c54d..9098253 100644
Binary files a/icons/emacs_24.png and b/icons/emacs_24.png differ

diff --git a/icons/emacs_32.png b/icons/emacs_32.png
index b102bc2..3840be5 100644
Binary files a/icons/emacs_32.png and b/icons/emacs_32.png differ

diff --git a/icons/emacs_48.png b/icons/emacs_48.png
index 2684af8..1c67855 100644
Binary files a/icons/emacs_48.png and b/icons/emacs_48.png differ

diff --git a/icons/emacs.png b/icons/gnome-emacs.png
similarity index 100%
rename from icons/emacs.png
rename to icons/gnome-emacs.png



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/emacs-tools:emacs-common-gentoo commit in: icons/, /
@ 2012-05-06 16:06 Sebastian Pipping
  0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Pipping @ 2012-05-06 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     ef0984fd070308e495286b2cce181a2a7a34ccc1
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 17:01:12 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jul 11 17:01:12 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=ef0984fd

Update emacs23.svg from Emacs CVS.

svn path=/emacs-common-gentoo/; revision=1316

---
 ChangeLog         |    4 ++++
 icons/emacs23.svg |   10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01b2982..0dead0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-11  Ulrich Mueller  <ulm@gentoo.org>
+
+	* icons/emacs23.svg: Update from Emacs CVS.
+
 2009-04-22  Ulrich Mueller  <ulm@gentoo.org>
 
 	* Version 1.1 released.

diff --git a/icons/emacs23.svg b/icons/emacs23.svg
index 5e9c749..835a48f 100644
--- a/icons/emacs23.svg
+++ b/icons/emacs23.svg
@@ -26,8 +26,8 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    version="1.0"
-   width="512"
-   height="512"
+   width="48"
+   height="48"
    viewBox="0.171 0.201 512 512"
    id="svg4768"
    xml:space="preserve">
@@ -207,15 +207,15 @@
    gradientUnits="userSpaceOnUse"
    gradientTransform="matrix(-0.1008165,-8.0872321e-2,1.0745309,-1.3395252,13.843287,784.79288)" /></defs>
 <path
-   d="M 404.38153,471.26172 A 170.49393,31.611336 0 1 1 63.393677,471.26172 A 170.49393,31.611336 0 1 1 404.38153,471.26172 z"
+   d="M 404.38153,471.26172 C 404.40061,488.72268 328.06229,502.87946 233.8876,502.87946 C 139.71291,502.87946 63.374595,488.72268 63.393677,471.26172 C 63.374595,453.80076 139.71291,439.64398 233.8876,439.64398 C 328.06229,439.64398 404.40061,453.80076 404.38153,471.26172 z"
    transform="matrix(1.3434649,0,0,1.3934426,-81.886873,-193.70595)"
    id="path4912"
    style="opacity:1;fill:url(#radialGradient4944);fill-opacity:1;stroke:#7b0000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-   d="M 277.19656,7.985198 A 266.76535,284.35425 0 1 1 -256.33414,7.985198 A 266.76535,284.35425 0 1 1 277.19656,7.985198 z"
+   d="M 277.19656,7.985198 C 277.19656,165.02971 157.76164,292.33945 10.43121,292.33945 C -136.89922,292.33945 -256.33414,165.02971 -256.33414,7.985198 C -256.33414,-149.05932 -136.89922,-276.36905 10.43121,-276.36905 C 157.76164,-276.36905 277.19656,-149.05932 277.19656,7.985198 z"
    transform="matrix(0.8855031,0,0,0.8392166,227.80221,232.6491)"
    id="path4864"
    style="opacity:1;fill:url(#radialGradient4892);fill-opacity:1;stroke:#7b0000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
-   d="M 376.39771,371.76376 A 76.696358,69.959511 0 1 1 223.005,371.76376 A 76.696358,69.959511 0 1 1 376.39771,371.76376 z"
+   d="M 376.39771,371.76376 C 376.40956,410.40897 342.06796,441.74284 299.70135,441.74284 C 257.33475,441.74284 222.99315,410.40897 223.005,371.76376 C 222.99315,333.11855 257.33475,301.78468 299.70135,301.78468 C 342.06796,301.78468 376.40956,333.11855 376.39771,371.76376 L 376.39771,371.76376 z"
    transform="matrix(1.4594595,0,0,1,-195.74111,-13.473684)"
    id="path4946"
    style="opacity:1;fill:url(#radialGradient4972);fill-opacity:1;stroke:#7b0000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/emacs-tools:emacs-common-gentoo commit in: icons/, /
@ 2013-11-15 13:31 Ulrich Müller
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2013-11-15 13:31 UTC (permalink / raw
  To: gentoo-commits

commit:     9f6c358940967d8bb395c51a857eb57843429e1c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 13:31:52 2013 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 13:31:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=9f6c3589

Remove gnome-emacs.png icon file.

* icons/gnome-emacs.png: File removed. The ebuild does not install
this icon since a long time.
* icons/COPYRIGHT.icons: Update.
* Makefile (ICONFILES): Update.

---
 ChangeLog             |   5 +++++
 Makefile              |   2 +-
 icons/COPYRIGHT.icons |   6 ------
 icons/gnome-emacs.png | Bin 4443 -> 0 bytes
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d19292c..69c720d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-11-15  Ulrich Müller  <ulm@gentoo.org>
 
+	* icons/gnome-emacs.png: File removed. The ebuild does not install
+	this icon since a long time.
+	* icons/COPYRIGHT.icons: Update.
+	* Makefile (ICONFILES): Update.
+
 	* site-gentoo.el: New file. Gentoo site startup, initially empty.
 	* Makefile (DISTFILES): Update.
 

diff --git a/Makefile b/Makefile
index 99e9ba5..5cb2e9b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ PV = $(shell sed '/^[ \t]*\* [Vv]ersion/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' \
 P = $(PN)-$(PV)
 
 DESKTOPFILES = emacs.desktop emacsclient.desktop
-ICONFILES = gnome-emacs.png sink.png \
+ICONFILES = sink.png \
 	emacs22_16.png emacs22_24.png emacs22_32.png emacs22_48.png \
 	emacs_16.png emacs_24.png emacs_32.png emacs_48.png emacs_128.png \
 	emacs.svg

diff --git a/icons/COPYRIGHT.icons b/icons/COPYRIGHT.icons
index 859d9f4..e03fa2e 100644
--- a/icons/COPYRIGHT.icons
+++ b/icons/COPYRIGHT.icons
@@ -6,12 +6,6 @@ File: sink.png
   Published in 1987 without copyright notice
   License: public domain
 
-File: gnome-emacs.png
-  Taken from GNOME
-  Authors: Garrett LeSage <garrett@linux.com>
-           Tuomas Kuosmanen <tigert@gimp.org>
-  License: GNU General Public License version 2 or later
-
 Files: emacs22_16.png emacs22_24.png emacs22_32.png emacs22_48.png
   Taken from Emacs 22.1
   Author: Andrew Zhilin <andrew_zhilin@yahoo.com>

diff --git a/icons/gnome-emacs.png b/icons/gnome-emacs.png
deleted file mode 100644
index 4eaca87..0000000
Binary files a/icons/gnome-emacs.png and /dev/null differ


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/emacs-tools:emacs-common-gentoo commit in: icons/, /
@ 2017-02-04 14:35 Ulrich Müller
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2017-02-04 14:35 UTC (permalink / raw
  To: gentoo-commits

commit:     bfe888269725fcab01f7a48c62d2f4c1f98d004f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 14:09:28 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 14:09:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=bfe88826

New icons from Emacs 25.1.

* icons/emacs25_*.png, icons/emacs25.svg: New files, from Emacs 25.1.
* icons/COPYRIGHT.icons: Update.
* Makefile (ICONFILES): Update.

 ChangeLog             |   4 +
 Makefile              |   4 +-
 icons/COPYRIGHT.icons |   6 ++
 icons/emacs25.svg     | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++
 icons/emacs25_128.png | Bin 0 -> 10201 bytes
 icons/emacs25_16.png  | Bin 0 -> 954 bytes
 icons/emacs25_24.png  | Bin 0 -> 1561 bytes
 icons/emacs25_32.png  | Bin 0 -> 2184 bytes
 icons/emacs25_48.png  | Bin 0 -> 3411 bytes
 9 files changed, 299 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 88361a1..b26b35e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-02-04  Ulrich Müller  <ulm@gentoo.org>
 
+	* icons/emacs25_*.png, icons/emacs25.svg: New files, from Emacs 25.1.
+	* icons/COPYRIGHT.icons: Update.
+	* Makefile (ICONFILES): Update.
+
 	* icons/emacs23_*.png, icons/emacs23.svg: Renamed from emacs_*.png
 	and emacs.svg, respectively.
 	* icons/COPYRIGHT.icons: Update.

diff --git a/Makefile b/Makefile
index 95f1c17..5154dae 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,9 @@ DESKTOPFILES = emacs.desktop emacsclient.desktop
 ICONFILES = sink.png \
 	emacs22_16.png emacs22_24.png emacs22_32.png emacs22_48.png \
 	emacs23_16.png emacs23_24.png emacs23_32.png emacs23_48.png \
-	emacs23_128.png emacs23.svg
+	emacs23_128.png emacs23.svg \
+	emacs25_16.png emacs25_24.png emacs25_32.png emacs25_48.png \
+	emacs25_128.png emacs25.svg
 DISTFILES = site-start.el site-gentoo.el subdirs.el $(DESKTOPFILES) \
 	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES))
 

diff --git a/icons/COPYRIGHT.icons b/icons/COPYRIGHT.icons
index 50c5748..4041dd4 100644
--- a/icons/COPYRIGHT.icons
+++ b/icons/COPYRIGHT.icons
@@ -24,3 +24,9 @@ File: emacs23.svg
            Chong Yidong <cyd@stupidchicken.com>
   Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later
+
+Files: emacs25_*.png emacs25.svg
+  Taken from Emacs 25.1 (PNG files run through OptiPNG)
+  Author: Nicolas Petton <nicolas@petton.fr>
+  Copyright (C) 2015-2016 Free Software Foundation, Inc.
+  License: GNU General Public License version 3 or later

diff --git a/icons/emacs25.svg b/icons/emacs25.svg
new file mode 100644
index 0000000..bdf13e6
--- /dev/null
+++ b/icons/emacs25.svg
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xml:space="preserve"
+   id="svg4768"
+   viewBox="0.171 0.201 512 512"
+   height="48"
+   width="48"
+   version="1.0"><metadata
+     id="metadata70"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><!-- Gnu Emacs Icon
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
+
+   Author: Nicolas Petton <nicolas@petton.fr>
+
+   This file is part of GNU Emacs.
+
+   GNU Emacs is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   GNU Emacs is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+--><!-- Created with Inkscape (http://www.inkscape.org/) --><defs
+     id="defs4770"><linearGradient
+       id="linearGradient4292"><stop
+         id="stop4294"
+         offset="0"
+         style="stop-color:#411f5d;stop-opacity:1" /><stop
+         id="stop4296"
+         offset="1"
+         style="stop-color:#5b2a85;stop-opacity:1" /></linearGradient><linearGradient
+       id="linearGradient4284"><stop
+         offset="0"
+         style="stop-color:#8381c5;stop-opacity:1"
+         id="stop4286" /><stop
+         id="stop4290"
+         style="stop-color:#7e55b3;stop-opacity:0.99607843"
+         offset="0.56639391" /><stop
+         offset="1"
+         style="stop-color:#a52ecb;stop-opacity:0.99215686"
+         id="stop4288" /></linearGradient><linearGradient
+       id="linearGradient4898"><stop
+         id="stop4278"
+         style="stop-color:#bab8db;stop-opacity:1"
+         offset="0" /><stop
+         id="stop4280"
+         style="stop-color:#5955a9;stop-opacity:0.99159664"
+         offset="1" /></linearGradient><linearGradient
+       id="linearGradient3294"><stop
+         offset="0"
+         style="stop-color:#6376e6;stop-opacity:1"
+         id="stop3296" /><stop
+         offset="0.50094414"
+         style="stop-color:#222989;stop-opacity:1"
+         id="stop3302" /><stop
+         offset="1"
+         style="stop-color:#00003d;stop-opacity:1"
+         id="stop3298" /></linearGradient><linearGradient
+       id="linearGradient3284"><stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3286" /><stop
+         offset="0.84845906"
+         style="stop-color:#000000;stop-opacity:0.49803922"
+         id="stop3292" /><stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3288" /></linearGradient><linearGradient
+       id="linearGradient3274"><stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3276" /><stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3278" /></linearGradient><linearGradient
+       id="linearGradient3262"><stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3264" /><stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop3266" /></linearGradient><linearGradient
+       id="linearGradient3242"><stop
+         offset="0"
+         style="stop-color:#282828;stop-opacity:1"
+         id="stop3244" /><stop
+         offset="0.39253417"
+         style="stop-color:#808080;stop-opacity:1"
+         id="stop3252" /><stop
+         offset="1"
+         style="stop-color:#d9d9d9;stop-opacity:1"
+         id="stop3246" /></linearGradient><linearGradient
+       id="linearGradient3202"><stop
+         offset="0"
+         style="stop-color:#2b2b2b;stop-opacity:1"
+         id="stop3204" /><stop
+         offset="0.5"
+         style="stop-color:#828383;stop-opacity:1"
+         id="stop3250" /><stop
+         offset="1"
+         style="stop-color:#dadbdb;stop-opacity:1"
+         id="stop3206" /></linearGradient><linearGradient
+       id="linearGradient4966"><stop
+         offset="0"
+         style="stop-color:#b6b3d8;stop-opacity:1"
+         id="stop4968" /><stop
+         offset="1"
+         style="stop-color:#b6b3d8;stop-opacity:0"
+         id="stop4970" /></linearGradient><linearGradient
+       id="linearGradient4938"><stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop4940" /><stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop4942" /></linearGradient><linearGradient
+       id="linearGradient4282"><stop
+         offset="0"
+         style="stop-color:#bab8db;stop-opacity:1"
+         id="stop4900" /><stop
+         offset="1"
+         style="stop-color:#5955a9;stop-opacity:0.99159664"
+         id="stop4902" /></linearGradient><linearGradient
+       id="linearGradient4876"><stop
+         offset="0"
+         style="stop-color:#d3d2e8;stop-opacity:1"
+         id="stop4878" /><stop
+         offset="1"
+         style="stop-color:#5955a9;stop-opacity:0.99159664"
+         id="stop4880" /></linearGradient><radialGradient
+       gradientTransform="matrix(0.6817439,0,0,0.5905355,-3.8523706,-28.935273)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4898"
+       id="radialGradient4892"
+       fy="-108.96888"
+       fx="20.951529"
+       r="266.76535"
+       cy="-108.96888"
+       cx="20.951529" /><radialGradient
+       gradientTransform="matrix(1,0,0,0.1854103,0,383.88493)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4938"
+       id="radialGradient4944"
+       fy="471.26172"
+       fx="233.8876"
+       r="170.49393"
+       cy="471.26172"
+       cx="233.8876" /><radialGradient
+       gradientTransform="matrix(1,0,0,0.9121621,0,32.654948)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4966"
+       id="radialGradient4972"
+       fy="371.76376"
+       fx="299.70135"
+       r="76.696358"
+       cy="371.76376"
+       cx="299.70135" /><radialGradient
+       gradientTransform="matrix(0.414705,0.3300575,-0.5059004,0.6356454,346.95314,49.479585)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3202"
+       id="radialGradient3210"
+       fy="390.45248"
+       fx="289.44067"
+       r="17.67668"
+       cy="390.45248"
+       cx="289.44067" /><radialGradient
+       gradientTransform="matrix(0.414705,0.3300575,-0.5059004,0.6356454,448.41009,-65.398074)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3202"
+       id="radialGradient3238"
+       fy="382.14804"
+       fx="283.50717"
+       r="17.67668"
+       cy="382.14804"
+       cx="283.50717" /><radialGradient
+       gradientTransform="matrix(-6.5565014e-2,-5.9721765e-2,1.6871024,-1.8521705,171.90774,540.51473)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3242"
+       id="radialGradient3248"
+       fy="181.18982"
+       fx="418.45551"
+       r="63.068935"
+       cy="181.18982"
+       cx="418.45551" /><radialGradient
+       gradientTransform="matrix(0.4055116,-3.3440123e-2,0.1034174,4.3988695,177.23251,-1191.6649)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3262"
+       id="radialGradient3268"
+       fy="357.33591"
+       fx="354.51709"
+       r="33.712105"
+       cy="357.33591"
+       cx="354.51709" /><radialGradient
+       gradientTransform="matrix(-0.1339874,-0.1146812,0.3079048,-0.3597394,444.23592,395.03849)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3274"
+       id="radialGradient3280"
+       fy="223.55537"
+       fx="510.58469"
+       r="132.28336"
+       cy="223.55537"
+       cx="510.58469" /><radialGradient
+       gradientTransform="matrix(-1.2497569,1.3798305,-9.6289463e-2,-7.2974479e-2,674.3826,-70.590682)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3284"
+       id="radialGradient3290"
+       fy="-158.17821"
+       fx="284.4671"
+       r="110.2972"
+       cy="-158.17821"
+       cx="284.4671" /><radialGradient
+       gradientTransform="matrix(-0.1008165,-8.0872321e-2,1.0745309,-1.3395252,13.843287,784.79288)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3294"
+       id="radialGradient3300"
+       fy="356.62274"
+       fx="425.51019"
+       r="143.34167"
+       cy="356.62274"
+       cx="425.51019" /><filter
+       height="1.088351"
+       y="-0.044175496"
+       width="1.0892536"
+       x="-0.044626798"
+       id="filter4350"
+       style="color-interpolation-filters:sRGB"><feGaussianBlur
+         id="feGaussianBlur4352"
+         stdDeviation="8.7848425" /></filter><linearGradient
+       y2="300.73987"
+       x2="236.61363"
+       y1="-161.8512"
+       x1="-122.20192"
+       spreadMethod="pad"
+       gradientTransform="matrix(0.87385837,0,0,0.82818057,246.00762,250.28138)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4245"
+       xlink:href="#linearGradient4284" /><linearGradient
+       y2="66.018341"
+       x2="173.94518"
+       y1="396.6066"
+       x1="447.80933"
+       gradientTransform="matrix(0.98684959,0,0,0.98684959,3.0344187,2.5250397)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4247"
+       xlink:href="#linearGradient4292" /></defs><rect
+     style="fill:none;display:none"
+     id="rect4772"
+     y="0.20100001"
+     x="0.171"
+     height="512"
+     width="512" /><g
+     style="display:none"
+     id="g4788"><g
+       style="display:inline"
+       id="g4790" /></g><g
+     style="display:none"
+     id="g4806"><g
+       style="display:inline"
+       id="g4808"><path
+         style="fill:#050505;display:none"
+         id="path4810"
+         d="M 349.098,256.651 C 348.833,256.397 386.735,284.256 388.519,281.663 C 394.881,272.411 470.565,188.526 473.303,165.427 C 473.545,163.424 472.787,161.331 472.787,161.331 C 472.787,161.331 471.597,161.187 466.462,157.017 C 463.77,154.825 460.979,152.436 460.979,152.436 C 444.925,153.434 403.094,193.995 349.917,256.004" /></g></g><path
+     style="opacity:0.40500004;fill:#211f46;fill-opacity:0.99607843;stroke:#0a0b1b;stroke-width:8.53333378;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4350)"
+     id="path4233"
+     d="m 491.66937,257.75916 c 0,131.79436 -105.76,238.63481 -236.22155,238.63481 -130.46155,0 -236.221539,-106.84045 -236.221539,-238.63481 0,-131.79437 105.759989,-238.634808 236.221539,-238.634808 130.46155,0 236.22155,106.840438 236.22155,238.634808 z"
+     transform="matrix(0.98684957,0,0,0.98684957,3.0344041,2.5250397)" /><path
+     d="m 488.23812,256.89456 c 0,130.06121 -104.3692,235.49665 -233.1151,235.49665 -128.7459,0 -233.115201,-105.43544 -233.115201,-235.49665 0,-130.06123 104.369301,-235.49666 233.115201,-235.49666 128.7459,0 233.1151,105.43543 233.1151,235.49666 z"
+     id="path4235"
+     style="opacity:1;fill:url(#linearGradient4245);fill-opacity:1;stroke:url(#linearGradient4247);stroke-width:13.33816814;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+     d="m 175.0003,422.31057 c 0,0 19.7385,1.39634 45.1312,-0.84159 10.2834,-0.9063 49.3267,-4.74128 78.5169,-11.14289 0,0 35.5899,-7.61669 54.6301,-14.63335 19.9225,-7.34185 30.7636,-13.57304 35.6433,-22.40243 -0.2128,-1.80907 1.5024,-8.22438 -7.685,-12.07788 -23.4887,-9.85199 -50.73,-8.06998 -104.6338,-9.21285 -59.7772,-2.05391 -79.6627,-12.05971 -90.2556,-20.11838 -10.1579,-8.17519 -5.05,-30.79254 38.4742,-50.71499 21.9244,-10.60898 107.8705,-30.18698 107.8705,-30.18698 -28.9451,-14.30725 -82.9186,-39.45893 -94.0134,-44.89023 -9.7308,-4.76348 -25.303,-11.93595 -28.6785,-20.61368 -3.8271,-8.33089 9.0383,-15.50726 16.2248,-17.56236 23.1448,-6.67602 55.8182,-10.82538 85.5548,-11.29122 14.9472,-0.23417 17.3734,-1.19586 17.3734,-1.19586 20.6243,-3.42116 34.2014,-17.53175 28.5446,-39.87876 -5.0783,-22.81046 -31.8617,-36.21365 -57.3138,-31.57361 -23.9682,4.36956 -81.7378,21.15007 -81.7378,21.15007 71.4075,-0.61803 83.3592,0.57378 88.697,8.03676 3.1523,4.40742 -1.4324,10.45068 -20.4765,1
 3.56099 -20.733,3.38616 -63.8312,7.46399 -63.8312,7.46399 -41.3449,2.4554 -70.4682,2.61974 -79.203,21.11314 -5.7065,12.08196 6.0854,22.7633 11.2538,29.4493 21.8407,24.28905 53.3882,37.38879 73.6948,47.03553 7.6405,3.62963 30.0586,10.48407 30.0586,10.48407 -65.8782,-3.62335 -113.4003,16.6055 -141.2764,39.89622 -31.5288,29.16261 -17.581403,63.92354 47.0124,85.3268 38.1517,12.6416 57.0725,18.58695 113.9815,13.46232 33.52,-1.80673 38.8041,-0.73155 39.1383,2.01892 0.4705,3.87242 -37.2311,13.49165 -47.524,16.4606 -26.1853,7.55306 -94.8276,22.80438 -95.1712,22.87835 z"
+     id="path4237"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></svg>

diff --git a/icons/emacs25_128.png b/icons/emacs25_128.png
new file mode 100644
index 0000000..6f1118b
Binary files /dev/null and b/icons/emacs25_128.png differ

diff --git a/icons/emacs25_16.png b/icons/emacs25_16.png
new file mode 100644
index 0000000..eb6b402
Binary files /dev/null and b/icons/emacs25_16.png differ

diff --git a/icons/emacs25_24.png b/icons/emacs25_24.png
new file mode 100644
index 0000000..786a140
Binary files /dev/null and b/icons/emacs25_24.png differ

diff --git a/icons/emacs25_32.png b/icons/emacs25_32.png
new file mode 100644
index 0000000..d3fec36
Binary files /dev/null and b/icons/emacs25_32.png differ

diff --git a/icons/emacs25_48.png b/icons/emacs25_48.png
new file mode 100644
index 0000000..47d8102
Binary files /dev/null and b/icons/emacs25_48.png differ


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-02-04 14:35 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-04 14:35 [gentoo-commits] proj/emacs-tools:emacs-common-gentoo commit in: icons/, / Ulrich Müller
  -- strict thread matches above, loose matches on Subject: below --
2013-11-15 13:31 Ulrich Müller
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox