Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] emacs r1242 - in emacs-common-gentoo: . icons
Date: Sun, 05 Apr 2009 19:26:16
Message-Id: E1LqXyw-0006lq-4N@stork.gentoo.org
1 Author: ulm
2 Date: 2009-04-05 19:26:13 +0000 (Sun, 05 Apr 2009)
3 New Revision: 1242
4
5 Added:
6 emacs-common-gentoo/icons/
7 emacs-common-gentoo/icons/COPYRIGHT.icons
8 emacs-common-gentoo/icons/emacs.png
9 emacs-common-gentoo/icons/emacs23_128.png
10 emacs-common-gentoo/icons/emacs23_16.png
11 emacs-common-gentoo/icons/emacs23_24.png
12 emacs-common-gentoo/icons/emacs23_32.png
13 emacs-common-gentoo/icons/emacs23_48.png
14 emacs-common-gentoo/icons/emacs_16.png
15 emacs-common-gentoo/icons/emacs_24.png
16 emacs-common-gentoo/icons/emacs_32.png
17 emacs-common-gentoo/icons/emacs_48.png
18 emacs-common-gentoo/icons/sink.png
19 Removed:
20 emacs-common-gentoo/README.icons
21 emacs-common-gentoo/emacs.png
22 emacs-common-gentoo/emacs_16.png
23 emacs-common-gentoo/emacs_24.png
24 emacs-common-gentoo/emacs_32.png
25 emacs-common-gentoo/emacs_48.png
26 emacs-common-gentoo/gnured_48.png
27 Modified:
28 emacs-common-gentoo/ChangeLog
29 emacs-common-gentoo/Makefile
30 Log:
31 Add some new icon files, and move all icons to a subdirectory.
32
33 Modified: emacs-common-gentoo/ChangeLog
34 ===================================================================
35 --- emacs-common-gentoo/ChangeLog 2009-03-22 19:50:37 UTC (rev 1241)
36 +++ emacs-common-gentoo/ChangeLog 2009-04-05 19:26:13 UTC (rev 1242)
37 @@ -1,3 +1,19 @@
38 +2009-04-05 Ulrich Mueller <ulm@g.o>
39 +
40 + * icons/emacs.png, icons/emacs_16.png, icons/emacs_24.png:
41 + * icons/emacs_32.png, icons/emacs_48.png: Moved to subdirectory.
42 + * icons/emacs23_16.png, icons/emacs23_24.png:
43 + * icons/emacs23_32.png, icons/emacs23_48.png:
44 + * icons/emacs23_128.png: New files, taken from Emacs 23.0.92,
45 + optimised with OptiPNG.
46 + * icons/sink.png: New file, converted from sink.h of Emacs 18.41.
47 + * gnured_48.png: File removed.
48 + * icons/COPYRIGHT.icons: Renamed from README.icons and updated.
49 +
50 + * Makefile: Change licence from GPL v2 only to GPL v2 or later.
51 + (ICONFILES): New variable.
52 + (DISTFILES): Update.
53 +
54 2009-03-07 Ulrich Mueller <ulm@g.o>
55
56 * Version 1.0 released.
57 @@ -78,4 +94,4 @@
58 * emacs.desktop, emacs.png: New files.
59
60 Copyright 2007-2009 Gentoo Foundation
61 -Distributed under the terms of the GNU General Public License v2
62 +Distributed under the terms of the GNU General Public License v2 or later
63
64 Modified: emacs-common-gentoo/Makefile
65 ===================================================================
66 --- emacs-common-gentoo/Makefile 2009-03-22 19:50:37 UTC (rev 1241)
67 +++ emacs-common-gentoo/Makefile 2009-04-05 19:26:13 UTC (rev 1242)
68 @@ -1,5 +1,5 @@
69 # Copyright 2007-2009 Gentoo Foundation
70 -# Distributed under the terms of the GNU General Public License v2
71 +# Distributed under the terms of the GNU General Public License v2 or later
72
73 PN = emacs-common-gentoo
74 PV = $(shell sed '/^[ \t]*\* [Vv]ersion/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' \
75 @@ -7,8 +7,12 @@
76 P = $(PN)-$(PV)
77
78 DESKTOPFILES = emacs.desktop emacsclient.desktop
79 -DISTFILES = subdirs.el $(DESKTOPFILES) README.icons emacs.png \
80 - emacs_16.png emacs_24.png emacs_32.png emacs_48.png gnured_48.png
81 +ICONFILES = emacs.png sink.png \
82 + emacs_16.png emacs_24.png emacs_32.png emacs_48.png \
83 + emacs23_16.png emacs23_24.png emacs23_32.png emacs23_48.png \
84 + emacs23_128.png
85 +DISTFILES = subdirs.el $(DESKTOPFILES) \
86 + $(addprefix icons/,COPYRIGHT.icons $(ICONFILES))
87
88
89 .PHONY: all dist clean $(DESKTOPFILES)
90
91 Deleted: emacs-common-gentoo/README.icons
92 ===================================================================
93 --- emacs-common-gentoo/README.icons 2009-03-22 19:50:37 UTC (rev 1241)
94 +++ emacs-common-gentoo/README.icons 2009-04-05 19:26:13 UTC (rev 1242)
95 @@ -1,20 +0,0 @@
96 -COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
97 -
98 -File: emacs.png
99 - Taken from GNOME (gnome-emacs.png)
100 - Authors: Garrett LeSage <garrett@×××××.com>
101 - Tuomas Kuosmanen <tigert@××××.org>
102 - License: GNU General Public License version 2 or later
103 -
104 -Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png
105 - Taken from Emacs 22
106 - Author: Andrew Zhilin <andrew_zhilin@×××××.com>
107 - Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
108 - License: GNU General Public License version 2 or later
109 -
110 -File: gnured_48.png
111 - Based on splash.xpm from Emacs 22
112 - Author: Luis Fernandes <elf@××××××××××.ca>
113 - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
114 - Free Software Foundation, Inc.
115 - License: GNU General Public License version 2 or later
116
117 Deleted: emacs-common-gentoo/emacs.png
118 ===================================================================
119 (Binary files differ)
120
121 Deleted: emacs-common-gentoo/emacs_16.png
122 ===================================================================
123 (Binary files differ)
124
125 Deleted: emacs-common-gentoo/emacs_24.png
126 ===================================================================
127 (Binary files differ)
128
129 Deleted: emacs-common-gentoo/emacs_32.png
130 ===================================================================
131 (Binary files differ)
132
133 Deleted: emacs-common-gentoo/emacs_48.png
134 ===================================================================
135 (Binary files differ)
136
137 Deleted: emacs-common-gentoo/gnured_48.png
138 ===================================================================
139 (Binary files differ)
140
141 Copied: emacs-common-gentoo/icons/COPYRIGHT.icons (from rev 1240, emacs-common-gentoo/README.icons)
142 ===================================================================
143 --- emacs-common-gentoo/icons/COPYRIGHT.icons (rev 0)
144 +++ emacs-common-gentoo/icons/COPYRIGHT.icons 2009-04-05 19:26:13 UTC (rev 1242)
145 @@ -0,0 +1,26 @@
146 +COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
147 +
148 +File: sink.png
149 + Taken from Emacs 18.41 (sink.h)
150 + Author: ?
151 + Published in 1987 without copyright notice
152 + License: public domain
153 +
154 +File: emacs.png
155 + Taken from GNOME (gnome-emacs.png)
156 + Authors: Garrett LeSage <garrett@×××××.com>
157 + Tuomas Kuosmanen <tigert@××××.org>
158 + License: GNU General Public License version 2 or later
159 +
160 +Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png
161 + Taken from Emacs 22.1
162 + Author: Andrew Zhilin <andrew_zhilin@×××××.com>
163 + Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
164 + License: GNU General Public License version 2 or later
165 +
166 +Files: emacs23_16.png emacs23_24.png emacs23_32.png emacs23_48.png
167 + emacs23_128.png
168 + Taken from Emacs 23.0.92 (and run through OptiPNG)
169 + Author: Kentaro Ohkouchi <nanasess@××××××.jp>
170 + Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
171 + License: GNU General Public License version 3 or later
172
173 Copied: emacs-common-gentoo/icons/emacs.png (from rev 1240, emacs-common-gentoo/emacs.png)
174 ===================================================================
175 (Binary files differ)
176
177 Added: emacs-common-gentoo/icons/emacs23_128.png
178 ===================================================================
179 (Binary files differ)
180
181
182 Property changes on: emacs-common-gentoo/icons/emacs23_128.png
183 ___________________________________________________________________
184 Name: svn:mime-type
185 + image/png
186
187 Added: emacs-common-gentoo/icons/emacs23_16.png
188 ===================================================================
189 (Binary files differ)
190
191
192 Property changes on: emacs-common-gentoo/icons/emacs23_16.png
193 ___________________________________________________________________
194 Name: svn:mime-type
195 + image/png
196
197 Added: emacs-common-gentoo/icons/emacs23_24.png
198 ===================================================================
199 (Binary files differ)
200
201
202 Property changes on: emacs-common-gentoo/icons/emacs23_24.png
203 ___________________________________________________________________
204 Name: svn:mime-type
205 + image/png
206
207 Added: emacs-common-gentoo/icons/emacs23_32.png
208 ===================================================================
209 (Binary files differ)
210
211
212 Property changes on: emacs-common-gentoo/icons/emacs23_32.png
213 ___________________________________________________________________
214 Name: svn:mime-type
215 + image/png
216
217 Added: emacs-common-gentoo/icons/emacs23_48.png
218 ===================================================================
219 (Binary files differ)
220
221
222 Property changes on: emacs-common-gentoo/icons/emacs23_48.png
223 ___________________________________________________________________
224 Name: svn:mime-type
225 + image/png
226
227 Copied: emacs-common-gentoo/icons/emacs_16.png (from rev 1240, emacs-common-gentoo/emacs_16.png)
228 ===================================================================
229 (Binary files differ)
230
231 Copied: emacs-common-gentoo/icons/emacs_24.png (from rev 1240, emacs-common-gentoo/emacs_24.png)
232 ===================================================================
233 (Binary files differ)
234
235 Copied: emacs-common-gentoo/icons/emacs_32.png (from rev 1240, emacs-common-gentoo/emacs_32.png)
236 ===================================================================
237 (Binary files differ)
238
239 Copied: emacs-common-gentoo/icons/emacs_48.png (from rev 1240, emacs-common-gentoo/emacs_48.png)
240 ===================================================================
241 (Binary files differ)
242
243 Added: emacs-common-gentoo/icons/sink.png
244 ===================================================================
245 (Binary files differ)
246
247
248 Property changes on: emacs-common-gentoo/icons/sink.png
249 ___________________________________________________________________
250 Name: svn:mime-type
251 + image/png