UGR Cantarell font

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

  1. universe
  2. Merge into dev
Proposed by JC Hulce
Status: Merged
Approved by: JC Hulce
Approved revision: 9
Merged at revision: 8
Proposed branch: lp:~soaringsky/ugr-cantarell/universe
Merge into: lp:ugr-cantarell
Diff against target: 444 lines (+139/-232)
10 files modified
debian/changelog (+5/-17)
debian/control (+10/-9)
debian/copyright (+113/-8)
debian/postinst.ex (+0/-39)
debian/postrm.ex (+0/-37)
debian/preinst.ex (+0/-35)
debian/prerm.ex (+0/-38)
debian/rules (+7/-49)
debian/source/format (+1/-0)
debian/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+70937@code.launchpad.net

Commit message

 * Clean changelog
 * Add debian/watch and get-orig-source
 * Proper use of source package
 * Change maintainer
 * Change package name
 * Clean copyright

Description of the change

 * Clean changelog
 * Add debian/watch and get-orig-source
 * Proper use of source package
 * Change maintainer
 * Change package name
 * Clean copyright

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
=== modified file 'debian/changelog'
--- debian/changelog 2011-05-08 04:42:09 +0000
+++ debian/changelog 2011-08-09 17:58:28 +0000
@@ -1,17 +1,5 @@
1cantarell-fonts (0.0.3-3) natty; urgency=low1otf-cantarell (0.0.6-0ubuntu1) oneiric; urgency=low
22
3 * Added fonts to package in source, not at build time. 3 * Initial release. (LP: #823413)
44
5 -- JC Hulce <jc@teampr0xy.net> Sat, 07 May 2011 23:40:50 -05005 -- JC Hulce <jc@teampr0xy.net> Tue, 09 Aug 2011 09:36:25 -0500
6
7cantarell-fonts (0.0.3-2) natty; urgency=low
8
9 * Fixed error with font location (LP: #779137)
10
11 -- JC Hulce <jc@teampr0xy.net> Sat, 07 May 2011 17:51:35 -0500
12
13cantarell-fonts (0.0.3-1) unstable; urgency=low
14
15 * Initial release
16
17 -- Daniel Sandman <revoltism@gmail.com> Wed, 04 May 2011 08:04:20 +0200
186
=== modified file 'debian/control'
--- debian/control 2011-05-05 05:54:57 +0000
+++ debian/control 2011-08-09 17:58:28 +0000
@@ -1,15 +1,16 @@
1Source: cantarell-fonts1Source: cantarell-fonts
2Section: fonts2Section: fonts
3Priority: extra3Priority: optional
4Maintainer: Daniel Sandman <revoltism@gmail.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Uploaders: JC Hulce <jc@teampr0xy.net>5XSBC-Original-Maintainer: Team UGR <ubuntugnometeam@lists.launchpad.net>
6Build-Depends: debhelper (>= 7.0.50~)6Build-Depends: debhelper (>= 7.0.50~), autotools-dev, cdbs
7Standards-Version: 3.9.17Standards-Version: 3.9.2
8Homepage: http://abattis.org/cantarell/8Homepage: http://abattis.org/cantarell/
99
10Package: cantarell-fonts10Package: otf-cantarell
11Architecture: all11Architecture: all
12Depends: ${shlibs:Depends}, ${misc:Depends}12Depends: ${shlibs:Depends}, ${misc:Depends}
13Description: The GNOME 3 Windowing font13Description: Contemporary Humanist sans serif fonts for GNOME
14 A typeface designed for on-screen reading by Dave Crossland. Now part of the 14 The Cantarell typeface family is a contemporary Humanist
15 GNOME project.15 sans serif, and is used by the GNOME project for its user
16 interface.
1617
=== modified file 'debian/copyright'
--- debian/copyright 2011-05-05 05:54:57 +0000
+++ debian/copyright 2011-08-09 17:58:28 +0000
@@ -1,10 +1,115 @@
1This package was package for UGR by Daniel Sandman <revoltism@gmail.com>1Copyright (c) 2009-2011, Understanding Limited (dave@understandinglimited.com),
22Copyright (c) 2010-2011, Jakub Steiner (jimmac@gmail.com).
3Upstream Author:
4 Dave Crossland
5
6Copyright (c) 2009-2010, Understanding Limited (dave@understandinglimited.com),
7with Reserved Font Name Cantarell.
83
9This Font Software is licensed under the SIL Open Font License, Version 1.1.4This Font Software is licensed under the SIL Open Font License, Version 1.1.
10This license is available with a FAQ at: http://scripts.sil.org/OFL5This license is copied below, and is also available with a FAQ at:
6http://scripts.sil.org/OFL
7
8
9-----------------------------------------------------------
10SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
11-----------------------------------------------------------
12
13PREAMBLE
14The goals of the Open Font License (OFL) are to stimulate worldwide
15development of collaborative font projects, to support the font creation
16efforts of academic and linguistic communities, and to provide a free and
17open framework in which fonts may be shared and improved in partnership
18with others.
19
20The OFL allows the licensed fonts to be used, studied, modified and
21redistributed freely as long as they are not sold by themselves. The
22fonts, including any derivative works, can be bundled, embedded,
23redistributed and/or sold with any software provided that any reserved
24names are not used by derivative works. The fonts and derivatives,
25however, cannot be released under any other type of license. The
26requirement for fonts to remain under this license does not apply
27to any document created using the fonts or their derivatives.
28
29DEFINITIONS
30"Font Software" refers to the set of files released by the Copyright
31Holder(s) under this license and clearly marked as such. This may
32include source files, build scripts and documentation.
33
34"Reserved Font Name" refers to any names specified as such after the
35copyright statement(s).
36
37"Original Version" refers to the collection of Font Software components as
38distributed by the Copyright Holder(s).
39
40"Modified Version" refers to any derivative made by adding to, deleting,
41or substituting -- in part or in whole -- any of the components of the
42Original Version, by changing formats or by porting the Font Software to a
43new environment.
44
45"Author" refers to any designer, engineer, programmer, technical
46writer or other person who contributed to the Font Software.
47
48PERMISSION & CONDITIONS
49Permission is hereby granted, free of charge, to any person obtaining
50a copy of the Font Software, to use, study, copy, merge, embed, modify,
51redistribute, and sell modified and unmodified copies of the Font
52Software, subject to the following conditions:
53
541) Neither the Font Software nor any of its individual components,
55in Original or Modified Versions, may be sold by itself.
56
572) Original or Modified Versions of the Font Software may be bundled,
58redistributed and/or sold with any software, provided that each copy
59contains the above copyright notice and this license. These can be
60included either as stand-alone text files, human-readable headers or
61in the appropriate machine-readable metadata fields within text or
62binary files as long as those fields can be easily viewed by the user.
63
643) No Modified Version of the Font Software may use the Reserved Font
65Name(s) unless explicit written permission is granted by the corresponding
66Copyright Holder. This restriction only applies to the primary font name as
67presented to the users.
68
694) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
70Software shall not be used to promote, endorse or advertise any
71Modified Version, except to acknowledge the contribution(s) of the
72Copyright Holder(s) and the Author(s) or with their explicit written
73permission.
74
755) The Font Software, modified or unmodified, in part or in whole,
76must be distributed entirely under this license, and must not be
77distributed under any other license. The requirement for fonts to
78remain under this license does not apply to any document created
79using the Font Software.
80
81TERMINATION
82This license becomes null and void if any of the above conditions are
83not met.
84
85DISCLAIMER
86THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
87EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
88MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
89OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
90COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
91INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
92DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
93FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
94OTHER DEALINGS IN THE FONT SOFTWARE.
95
96
97Files: debian/*
98Copyright: 2011 Gianvito Cavasoli <janvitus@ubuntu-it.org>, 2011 Team UGR <ubuntugnometeam@lists.launchpad.net>
99License: GPL-2+
100 This package is free software; you can redistribute it and/or modify
101 it under the terms of the GNU General Public License as published by
102 the Free Software Foundation; either version 2 of the License, or
103 (at your option) any later version.
104 .
105 This package is distributed in the hope that it will be useful,
106 but WITHOUT ANY WARRANTY; without even the implied warranty of
107 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
108 GNU General Public License for more details.
109 .
110 You should have received a copy of the GNU General Public License
111 along with this program. If not, see <http://www.gnu.org/licenses/>
112 .
113 On Debian systems, the complete text of the GNU General
114 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
115
11116
=== removed file 'debian/postinst.ex'
--- debian/postinst.ex 2011-05-05 05:54:57 +0000
+++ debian/postinst.ex 1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
1#!/bin/sh
2# postinst script for cantarell-fonts
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <postinst> `configure' <most-recently-configured-version>
10# * <old-postinst> `abort-upgrade' <new version>
11# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
12# <new-version>
13# * <postinst> `abort-remove'
14# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
15# <failed-install-package> <version> `removing'
16# <conflicting-package> <version>
17# for details, see http://www.debian.org/doc/debian-policy/ or
18# the debian-policy package
19
20
21case "$1" in
22 configure)
23 ;;
24
25 abort-upgrade|abort-remove|abort-deconfigure)
26 ;;
27
28 *)
29 echo "postinst called with unknown argument \`$1'" >&2
30 exit 1
31 ;;
32esac
33
34# dh_installdeb will replace this with shell code automatically
35# generated by other debhelper scripts.
36
37#DEBHELPER#
38
39exit 0
400
=== removed file 'debian/postrm.ex'
--- debian/postrm.ex 2011-05-05 05:54:57 +0000
+++ debian/postrm.ex 1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
1#!/bin/sh
2# postrm script for cantarell-fonts
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <postrm> `remove'
10# * <postrm> `purge'
11# * <old-postrm> `upgrade' <new-version>
12# * <new-postrm> `failed-upgrade' <old-version>
13# * <new-postrm> `abort-install'
14# * <new-postrm> `abort-install' <old-version>
15# * <new-postrm> `abort-upgrade' <old-version>
16# * <disappearer's-postrm> `disappear' <overwriter>
17# <overwriter-version>
18# for details, see http://www.debian.org/doc/debian-policy/ or
19# the debian-policy package
20
21
22case "$1" in
23 purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
24 ;;
25
26 *)
27 echo "postrm called with unknown argument \`$1'" >&2
28 exit 1
29 ;;
30esac
31
32# dh_installdeb will replace this with shell code automatically
33# generated by other debhelper scripts.
34
35#DEBHELPER#
36
37exit 0
380
=== removed file 'debian/preinst.ex'
--- debian/preinst.ex 2011-05-05 05:54:57 +0000
+++ debian/preinst.ex 1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
1#!/bin/sh
2# preinst script for cantarell-fonts
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <new-preinst> `install'
10# * <new-preinst> `install' <old-version>
11# * <new-preinst> `upgrade' <old-version>
12# * <old-preinst> `abort-upgrade' <new-version>
13# for details, see http://www.debian.org/doc/debian-policy/ or
14# the debian-policy package
15
16
17case "$1" in
18 install|upgrade)
19 ;;
20
21 abort-upgrade)
22 ;;
23
24 *)
25 echo "preinst called with unknown argument \`$1'" >&2
26 exit 1
27 ;;
28esac
29
30# dh_installdeb will replace this with shell code automatically
31# generated by other debhelper scripts.
32
33#DEBHELPER#
34
35exit 0
360
=== removed file 'debian/prerm.ex'
--- debian/prerm.ex 2011-05-05 05:54:57 +0000
+++ debian/prerm.ex 1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
1#!/bin/sh
2# prerm script for cantarell-fonts
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <prerm> `remove'
10# * <old-prerm> `upgrade' <new-version>
11# * <new-prerm> `failed-upgrade' <old-version>
12# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
13# * <deconfigured's-prerm> `deconfigure' `in-favour'
14# <package-being-installed> <version> `removing'
15# <conflicting-package> <version>
16# for details, see http://www.debian.org/doc/debian-policy/ or
17# the debian-policy package
18
19
20case "$1" in
21 remove|upgrade|deconfigure)
22 ;;
23
24 failed-upgrade)
25 ;;
26
27 *)
28 echo "prerm called with unknown argument \`$1'" >&2
29 exit 1
30 ;;
31esac
32
33# dh_installdeb will replace this with shell code automatically
34# generated by other debhelper scripts.
35
36#DEBHELPER#
37
38exit 0
390
=== modified file 'debian/rules'
--- debian/rules 2011-05-07 22:55:18 +0000
+++ debian/rules 2011-08-09 17:58:28 +0000
@@ -1,50 +1,8 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
22include /usr/share/cdbs/1/rules/debhelper.mk
3configure: configure-stamp3include /usr/share/cdbs/1/class/autotools.mk
4configure-stamp:4
5 dh_testdir5get-orig-source:
6 # Add here commands to configure the package.6 # Uscan will read debian/watch, grab the correct version, repack, and leave it in the
77 # current directory
8 touch configure-stamp8 uscan --noconf --force-download --rename --repack --download-current-version --destdir=.
9
10build: build-stamp
11
12build-stamp: configure-stamp
13 dh_testdir
14 touch $@
15
16clean:
17 dh_testdir
18 #dh_testroot
19 rm -f build-stamp configure-stamp
20 rm -rf debian/cantarell-fonts
21 dh_clean
22
23install: build
24 dh_testdir
25 dh_testroot
26 dh_clean -k
27 dh_installdirs
28
29binary-indep: build install
30 dh_testdir
31 dh_testroot
32 dh_installchangelogs debian/changelog
33 dh_installdocs
34 dh_link
35 dh_compress
36 dh_fixperms
37 dh_installdeb
38 mkdir -p $(CURDIR)/debian/cantarell-fonts
39 cp -rf $(CURDIR)/src/* $(CURDIR)/debian/cantarell-fonts/
40 dh_gencontrol
41 dh_md5sums
42 dh_builddeb
43
44binary-arch: build install
45 touch debian/cantarell-fonts
46
47binary: binary-indep binary-arch
48.PHONY: build clean binary-indep binary-arch binary install
49
50
519
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2011-08-09 17:58:28 +0000
@@ -0,0 +1,1 @@
13.0 (native)
02
=== added file 'debian/watch'
--- debian/watch 1970-01-01 00:00:00 +0000
+++ debian/watch 2011-08-09 17:58:28 +0000
@@ -0,0 +1,3 @@
1version=3
2
3http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/([0-9].*)/cantarell-fonts-([0-9].*).tar.gz
04
=== removed directory 'src'
=== removed directory 'src/usr'
=== removed directory 'src/usr/share'
=== removed directory 'src/usr/share/fonts'
=== removed directory 'src/usr/share/fonts/cantarell'
=== removed file 'src/usr/share/fonts/cantarell/Cantarell-Bold.ttf'
1Binary files src/usr/share/fonts/cantarell/Cantarell-Bold.ttf 2011-05-08 04:42:52 +0000 and src/usr/share/fonts/cantarell/Cantarell-Bold.ttf 1970-01-01 00:00:00 +0000 differ5Binary files src/usr/share/fonts/cantarell/Cantarell-Bold.ttf 2011-05-08 04:42:52 +0000 and src/usr/share/fonts/cantarell/Cantarell-Bold.ttf 1970-01-01 00:00:00 +0000 differ
=== removed file 'src/usr/share/fonts/cantarell/Cantarell-BoldOblique.ttf'
2Binary files src/usr/share/fonts/cantarell/Cantarell-BoldOblique.ttf 2011-05-08 04:42:52 +0000 and src/usr/share/fonts/cantarell/Cantarell-BoldOblique.ttf 1970-01-01 00:00:00 +0000 differ6Binary files src/usr/share/fonts/cantarell/Cantarell-BoldOblique.ttf 2011-05-08 04:42:52 +0000 and src/usr/share/fonts/cantarell/Cantarell-BoldOblique.ttf 1970-01-01 00:00:00 +0000 differ
=== removed file 'src/usr/share/fonts/cantarell/Cantarell-Oblique.ttf'
3Binary files src/usr/share/fonts/cantarell/Cantarell-Oblique.ttf 2011-05-08 04:42:52 +0000 and src/usr/share/fonts/cantarell/Cantarell-Oblique.ttf 1970-01-01 00:00:00 +0000 differ7Binary files src/usr/share/fonts/cantarell/Cantarell-Oblique.ttf 2011-05-08 04:42:52 +0000 and src/usr/share/fonts/cantarell/Cantarell-Oblique.ttf 1970-01-01 00:00:00 +0000 differ
=== removed file 'src/usr/share/fonts/cantarell/Cantarell-Regular.ttf'
4Binary files src/usr/share/fonts/cantarell/Cantarell-Regular.ttf 2011-05-08 04:42:52 +0000 and src/usr/share/fonts/cantarell/Cantarell-Regular.ttf 1970-01-01 00:00:00 +0000 differ8Binary files src/usr/share/fonts/cantarell/Cantarell-Regular.ttf 2011-05-08 04:42:52 +0000 and src/usr/share/fonts/cantarell/Cantarell-Regular.ttf 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: