Merge lp:~soaringsky/ugr-cantarell/universe into lp:ugr-cantarell

Proposed by JC Hulce
Status: Merged
Approved by: JC Hulce
Approved revision: 11
Merged at revision: 10
Proposed branch: lp:~soaringsky/ugr-cantarell/universe
Merge into: lp:ugr-cantarell
Diff against target: 384 lines (+151/-151)
16 files modified
README (+2/-0)
changelog (+5/-0)
compat (+1/-0)
control (+16/-0)
copyright (+115/-0)
debian/README (+0/-2)
debian/changelog (+0/-5)
debian/compat (+0/-1)
debian/control (+0/-16)
debian/copyright (+0/-115)
debian/rules (+0/-8)
debian/source/format (+0/-1)
debian/watch (+0/-3)
rules (+8/-0)
source/format (+1/-0)
watch (+3/-0)
To merge this branch: bzr merge lp:~soaringsky/ugr-cantarell/universe
Reviewer Review Type Date Requested Status
JC Hulce (community) diffconfirm Approve
Review via email: mp+70954@code.launchpad.net

Commit message

Change layout to make autobuilds work

Description of the change

Change layout to make autobuilds work

To post a comment you must log in.
Revision history for this message
JC Hulce (soaringsky) :
review: Approve (diffconfirm)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'README'
2--- README 1970-01-01 00:00:00 +0000
3+++ README 2011-08-09 20:13:25 +0000
4@@ -0,0 +1,2 @@
5+More information at
6+http://abattis.org/cantarell/
7
8=== added file 'changelog'
9--- changelog 1970-01-01 00:00:00 +0000
10+++ changelog 2011-08-09 20:13:25 +0000
11@@ -0,0 +1,5 @@
12+cantarell-fonts (0.0.6-0ubuntu1) oneiric; urgency=low
13+
14+ * Initial release. (LP: #823413)
15+
16+ -- JC Hulce <jc@teampr0xy.net> Tue, 09 Aug 2011 09:36:25 -0500
17
18=== added file 'compat'
19--- compat 1970-01-01 00:00:00 +0000
20+++ compat 2011-08-09 20:13:25 +0000
21@@ -0,0 +1,1 @@
22+7
23
24=== added file 'control'
25--- control 1970-01-01 00:00:00 +0000
26+++ control 2011-08-09 20:13:25 +0000
27@@ -0,0 +1,16 @@
28+Source: cantarell-fonts
29+Section: fonts
30+Priority: optional
31+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
32+XSBC-Original-Maintainer: Team UGR <ubuntugnometeam@lists.launchpad.net>
33+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, cdbs
34+Standards-Version: 3.9.2
35+Homepage: http://abattis.org/cantarell/
36+
37+Package: otf-cantarell
38+Architecture: all
39+Depends: ${shlibs:Depends}, ${misc:Depends}
40+Description: Contemporary Humanist sans serif fonts for GNOME
41+ The Cantarell typeface family is a contemporary Humanist
42+ sans serif, and is used by the GNOME project for its user
43+ interface.
44
45=== added file 'copyright'
46--- copyright 1970-01-01 00:00:00 +0000
47+++ copyright 2011-08-09 20:13:25 +0000
48@@ -0,0 +1,115 @@
49+Copyright (c) 2009-2011, Understanding Limited (dave@understandinglimited.com),
50+Copyright (c) 2010-2011, Jakub Steiner (jimmac@gmail.com).
51+
52+This Font Software is licensed under the SIL Open Font License, Version 1.1.
53+This license is copied below, and is also available with a FAQ at:
54+http://scripts.sil.org/OFL
55+
56+
57+-----------------------------------------------------------
58+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
59+-----------------------------------------------------------
60+
61+PREAMBLE
62+The goals of the Open Font License (OFL) are to stimulate worldwide
63+development of collaborative font projects, to support the font creation
64+efforts of academic and linguistic communities, and to provide a free and
65+open framework in which fonts may be shared and improved in partnership
66+with others.
67+
68+The OFL allows the licensed fonts to be used, studied, modified and
69+redistributed freely as long as they are not sold by themselves. The
70+fonts, including any derivative works, can be bundled, embedded,
71+redistributed and/or sold with any software provided that any reserved
72+names are not used by derivative works. The fonts and derivatives,
73+however, cannot be released under any other type of license. The
74+requirement for fonts to remain under this license does not apply
75+to any document created using the fonts or their derivatives.
76+
77+DEFINITIONS
78+"Font Software" refers to the set of files released by the Copyright
79+Holder(s) under this license and clearly marked as such. This may
80+include source files, build scripts and documentation.
81+
82+"Reserved Font Name" refers to any names specified as such after the
83+copyright statement(s).
84+
85+"Original Version" refers to the collection of Font Software components as
86+distributed by the Copyright Holder(s).
87+
88+"Modified Version" refers to any derivative made by adding to, deleting,
89+or substituting -- in part or in whole -- any of the components of the
90+Original Version, by changing formats or by porting the Font Software to a
91+new environment.
92+
93+"Author" refers to any designer, engineer, programmer, technical
94+writer or other person who contributed to the Font Software.
95+
96+PERMISSION & CONDITIONS
97+Permission is hereby granted, free of charge, to any person obtaining
98+a copy of the Font Software, to use, study, copy, merge, embed, modify,
99+redistribute, and sell modified and unmodified copies of the Font
100+Software, subject to the following conditions:
101+
102+1) Neither the Font Software nor any of its individual components,
103+in Original or Modified Versions, may be sold by itself.
104+
105+2) Original or Modified Versions of the Font Software may be bundled,
106+redistributed and/or sold with any software, provided that each copy
107+contains the above copyright notice and this license. These can be
108+included either as stand-alone text files, human-readable headers or
109+in the appropriate machine-readable metadata fields within text or
110+binary files as long as those fields can be easily viewed by the user.
111+
112+3) No Modified Version of the Font Software may use the Reserved Font
113+Name(s) unless explicit written permission is granted by the corresponding
114+Copyright Holder. This restriction only applies to the primary font name as
115+presented to the users.
116+
117+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
118+Software shall not be used to promote, endorse or advertise any
119+Modified Version, except to acknowledge the contribution(s) of the
120+Copyright Holder(s) and the Author(s) or with their explicit written
121+permission.
122+
123+5) The Font Software, modified or unmodified, in part or in whole,
124+must be distributed entirely under this license, and must not be
125+distributed under any other license. The requirement for fonts to
126+remain under this license does not apply to any document created
127+using the Font Software.
128+
129+TERMINATION
130+This license becomes null and void if any of the above conditions are
131+not met.
132+
133+DISCLAIMER
134+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
135+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
136+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
137+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
138+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
139+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
140+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
141+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
142+OTHER DEALINGS IN THE FONT SOFTWARE.
143+
144+
145+Files: debian/*
146+Copyright: 2011 Gianvito Cavasoli <janvitus@ubuntu-it.org>, 2011 Team UGR <ubuntugnometeam@lists.launchpad.net>
147+License: GPL-2+
148+ This package is free software; you can redistribute it and/or modify
149+ it under the terms of the GNU General Public License as published by
150+ the Free Software Foundation; either version 2 of the License, or
151+ (at your option) any later version.
152+ .
153+ This package is distributed in the hope that it will be useful,
154+ but WITHOUT ANY WARRANTY; without even the implied warranty of
155+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
156+ GNU General Public License for more details.
157+ .
158+ You should have received a copy of the GNU General Public License
159+ along with this program. If not, see <http://www.gnu.org/licenses/>
160+ .
161+ On Debian systems, the complete text of the GNU General
162+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
163+
164
165=== removed directory 'debian'
166=== removed file 'debian/README'
167--- debian/README 2011-05-05 05:54:57 +0000
168+++ debian/README 1970-01-01 00:00:00 +0000
169@@ -1,2 +0,0 @@
170-More information at
171-http://abattis.org/cantarell/
172
173=== removed file 'debian/changelog'
174--- debian/changelog 2011-08-09 19:27:12 +0000
175+++ debian/changelog 1970-01-01 00:00:00 +0000
176@@ -1,5 +0,0 @@
177-cantarell-fonts (0.0.6-0ubuntu1) oneiric; urgency=low
178-
179- * Initial release. (LP: #823413)
180-
181- -- JC Hulce <jc@teampr0xy.net> Tue, 09 Aug 2011 09:36:25 -0500
182
183=== removed file 'debian/compat'
184--- debian/compat 2011-05-05 05:54:57 +0000
185+++ debian/compat 1970-01-01 00:00:00 +0000
186@@ -1,1 +0,0 @@
187-7
188
189=== removed file 'debian/control'
190--- debian/control 2011-08-09 17:54:14 +0000
191+++ debian/control 1970-01-01 00:00:00 +0000
192@@ -1,16 +0,0 @@
193-Source: cantarell-fonts
194-Section: fonts
195-Priority: optional
196-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
197-XSBC-Original-Maintainer: Team UGR <ubuntugnometeam@lists.launchpad.net>
198-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, cdbs
199-Standards-Version: 3.9.2
200-Homepage: http://abattis.org/cantarell/
201-
202-Package: otf-cantarell
203-Architecture: all
204-Depends: ${shlibs:Depends}, ${misc:Depends}
205-Description: Contemporary Humanist sans serif fonts for GNOME
206- The Cantarell typeface family is a contemporary Humanist
207- sans serif, and is used by the GNOME project for its user
208- interface.
209
210=== removed file 'debian/copyright'
211--- debian/copyright 2011-08-09 16:54:18 +0000
212+++ debian/copyright 1970-01-01 00:00:00 +0000
213@@ -1,115 +0,0 @@
214-Copyright (c) 2009-2011, Understanding Limited (dave@understandinglimited.com),
215-Copyright (c) 2010-2011, Jakub Steiner (jimmac@gmail.com).
216-
217-This Font Software is licensed under the SIL Open Font License, Version 1.1.
218-This license is copied below, and is also available with a FAQ at:
219-http://scripts.sil.org/OFL
220-
221-
222------------------------------------------------------------
223-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
224------------------------------------------------------------
225-
226-PREAMBLE
227-The goals of the Open Font License (OFL) are to stimulate worldwide
228-development of collaborative font projects, to support the font creation
229-efforts of academic and linguistic communities, and to provide a free and
230-open framework in which fonts may be shared and improved in partnership
231-with others.
232-
233-The OFL allows the licensed fonts to be used, studied, modified and
234-redistributed freely as long as they are not sold by themselves. The
235-fonts, including any derivative works, can be bundled, embedded,
236-redistributed and/or sold with any software provided that any reserved
237-names are not used by derivative works. The fonts and derivatives,
238-however, cannot be released under any other type of license. The
239-requirement for fonts to remain under this license does not apply
240-to any document created using the fonts or their derivatives.
241-
242-DEFINITIONS
243-"Font Software" refers to the set of files released by the Copyright
244-Holder(s) under this license and clearly marked as such. This may
245-include source files, build scripts and documentation.
246-
247-"Reserved Font Name" refers to any names specified as such after the
248-copyright statement(s).
249-
250-"Original Version" refers to the collection of Font Software components as
251-distributed by the Copyright Holder(s).
252-
253-"Modified Version" refers to any derivative made by adding to, deleting,
254-or substituting -- in part or in whole -- any of the components of the
255-Original Version, by changing formats or by porting the Font Software to a
256-new environment.
257-
258-"Author" refers to any designer, engineer, programmer, technical
259-writer or other person who contributed to the Font Software.
260-
261-PERMISSION & CONDITIONS
262-Permission is hereby granted, free of charge, to any person obtaining
263-a copy of the Font Software, to use, study, copy, merge, embed, modify,
264-redistribute, and sell modified and unmodified copies of the Font
265-Software, subject to the following conditions:
266-
267-1) Neither the Font Software nor any of its individual components,
268-in Original or Modified Versions, may be sold by itself.
269-
270-2) Original or Modified Versions of the Font Software may be bundled,
271-redistributed and/or sold with any software, provided that each copy
272-contains the above copyright notice and this license. These can be
273-included either as stand-alone text files, human-readable headers or
274-in the appropriate machine-readable metadata fields within text or
275-binary files as long as those fields can be easily viewed by the user.
276-
277-3) No Modified Version of the Font Software may use the Reserved Font
278-Name(s) unless explicit written permission is granted by the corresponding
279-Copyright Holder. This restriction only applies to the primary font name as
280-presented to the users.
281-
282-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
283-Software shall not be used to promote, endorse or advertise any
284-Modified Version, except to acknowledge the contribution(s) of the
285-Copyright Holder(s) and the Author(s) or with their explicit written
286-permission.
287-
288-5) The Font Software, modified or unmodified, in part or in whole,
289-must be distributed entirely under this license, and must not be
290-distributed under any other license. The requirement for fonts to
291-remain under this license does not apply to any document created
292-using the Font Software.
293-
294-TERMINATION
295-This license becomes null and void if any of the above conditions are
296-not met.
297-
298-DISCLAIMER
299-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
300-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
301-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
302-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
303-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
304-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
305-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
306-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
307-OTHER DEALINGS IN THE FONT SOFTWARE.
308-
309-
310-Files: debian/*
311-Copyright: 2011 Gianvito Cavasoli <janvitus@ubuntu-it.org>, 2011 Team UGR <ubuntugnometeam@lists.launchpad.net>
312-License: GPL-2+
313- This package is free software; you can redistribute it and/or modify
314- it under the terms of the GNU General Public License as published by
315- the Free Software Foundation; either version 2 of the License, or
316- (at your option) any later version.
317- .
318- This package is distributed in the hope that it will be useful,
319- but WITHOUT ANY WARRANTY; without even the implied warranty of
320- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
321- GNU General Public License for more details.
322- .
323- You should have received a copy of the GNU General Public License
324- along with this program. If not, see <http://www.gnu.org/licenses/>
325- .
326- On Debian systems, the complete text of the GNU General
327- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
328-
329
330=== removed file 'debian/rules'
331--- debian/rules 2011-08-09 16:54:18 +0000
332+++ debian/rules 1970-01-01 00:00:00 +0000
333@@ -1,8 +0,0 @@
334-#!/usr/bin/make -f
335-include /usr/share/cdbs/1/rules/debhelper.mk
336-include /usr/share/cdbs/1/class/autotools.mk
337-
338-get-orig-source:
339- # Uscan will read debian/watch, grab the correct version, repack, and leave it in the
340- # current directory
341- uscan --noconf --force-download --rename --repack --download-current-version --destdir=.
342
343=== removed directory 'debian/source'
344=== removed file 'debian/source/format'
345--- debian/source/format 2011-08-09 16:54:18 +0000
346+++ debian/source/format 1970-01-01 00:00:00 +0000
347@@ -1,1 +0,0 @@
348-3.0 (native)
349
350=== removed file 'debian/watch'
351--- debian/watch 2011-08-09 17:54:14 +0000
352+++ debian/watch 1970-01-01 00:00:00 +0000
353@@ -1,3 +0,0 @@
354-version=3
355-
356-http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/([0-9].*)/cantarell-fonts-([0-9].*).tar.gz
357
358=== added file 'rules'
359--- rules 1970-01-01 00:00:00 +0000
360+++ rules 2011-08-09 20:13:25 +0000
361@@ -0,0 +1,8 @@
362+#!/usr/bin/make -f
363+include /usr/share/cdbs/1/rules/debhelper.mk
364+include /usr/share/cdbs/1/class/autotools.mk
365+
366+get-orig-source:
367+ # Uscan will read debian/watch, grab the correct version, repack, and leave it in the
368+ # current directory
369+ uscan --noconf --force-download --rename --repack --download-current-version --destdir=.
370
371=== added directory 'source'
372=== added file 'source/format'
373--- source/format 1970-01-01 00:00:00 +0000
374+++ source/format 2011-08-09 20:13:25 +0000
375@@ -0,0 +1,1 @@
376+3.0 (native)
377
378=== added file 'watch'
379--- watch 1970-01-01 00:00:00 +0000
380+++ watch 2011-08-09 20:13:25 +0000
381@@ -0,0 +1,3 @@
382+version=3
383+
384+http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/([0-9].*)/cantarell-fonts-([0-9].*).tar.gz

Subscribers

People subscribed via source and target branches

to all changes: