JC Hulce has proposed merging lp:~soaringsky/ugr-cantarell/universe into lp:ugr-cantarell.
Requested reviews: JC Hulce (soaringsky): diffconfirm Related bugs: Bug #780323 in UGR Cantarell font: "Package does not install latest source" https://bugs.launchpad.net/ugr-cantarell/+bug/780323 Bug #822438 in UGR Cantarell font: "debian/watch or get-orig-source needed" https://bugs.launchpad.net/ugr-cantarell/+bug/822438 Bug #823059 in UGR Cantarell font: "clean changelog" https://bugs.launchpad.net/ugr-cantarell/+bug/823059 Bug #823070 in UGR Cantarell font: "fix up copyright" https://bugs.launchpad.net/ugr-cantarell/+bug/823070 Bug #823073 in UGR Cantarell font: "Change maintainer" https://bugs.launchpad.net/ugr-cantarell/+bug/823073 Bug #823076 in UGR Cantarell font: "Change package name" https://bugs.launchpad.net/ugr-cantarell/+bug/823076 For more details, see: https://code.launchpad.net/~soaringsky/ugr-cantarell/universe/+merge/70937 * Clean changelog * Add debian/watch and get-orig-source * Proper use of source package * Change maintainer * Change package name * Clean copyright -- https://code.launchpad.net/~soaringsky/ugr-cantarell/universe/+merge/70937 Your team Team UGR is subscribed to branch lp:ugr-cantarell.
=== 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 @@ -cantarell-fonts (0.0.3-3) natty; urgency=low - - * Added fonts to package in source, not at build time. - - -- JC Hulce <[email protected]> Sat, 07 May 2011 23:40:50 -0500 - -cantarell-fonts (0.0.3-2) natty; urgency=low - - * Fixed error with font location (LP: #779137) - - -- JC Hulce <[email protected]> Sat, 07 May 2011 17:51:35 -0500 - -cantarell-fonts (0.0.3-1) unstable; urgency=low - - * Initial release - - -- Daniel Sandman <[email protected]> Wed, 04 May 2011 08:04:20 +0200 +otf-cantarell (0.0.6-0ubuntu1) oneiric; urgency=low + + * Initial release. (LP: #823413) + + -- JC Hulce <[email protected]> Tue, 09 Aug 2011 09:36:25 -0500 === 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 @@ Source: cantarell-fonts Section: fonts -Priority: extra -Maintainer: Daniel Sandman <[email protected]> -Uploaders: JC Hulce <[email protected]> -Build-Depends: debhelper (>= 7.0.50~) -Standards-Version: 3.9.1 +Priority: optional +Maintainer: Ubuntu Developers <[email protected]> +XSBC-Original-Maintainer: Team UGR <[email protected]> +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, cdbs +Standards-Version: 3.9.2 Homepage: http://abattis.org/cantarell/ -Package: cantarell-fonts +Package: otf-cantarell Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} -Description: The GNOME 3 Windowing font - A typeface designed for on-screen reading by Dave Crossland. Now part of the - GNOME project. +Description: Contemporary Humanist sans serif fonts for GNOME + The Cantarell typeface family is a contemporary Humanist + sans serif, and is used by the GNOME project for its user + interface. === 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 @@ -This package was package for UGR by Daniel Sandman <[email protected]> - -Upstream Author: - Dave Crossland - -Copyright (c) 2009-2010, Understanding Limited ([email protected]), -with Reserved Font Name Cantarell. +Copyright (c) 2009-2011, Understanding Limited ([email protected]), +Copyright (c) 2010-2011, Jakub Steiner ([email protected]). This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is available with a FAQ at: http://scripts.sil.org/OFL +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + + +Files: debian/* +Copyright: 2011 Gianvito Cavasoli <[email protected]>, 2011 Team UGR <[email protected]> +License: GPL-2+ + This package 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 2 of the License, or + (at your option) any later version. + . + This package 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 this program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + === 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 @@ -#!/bin/sh -# postinst script for cantarell-fonts -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <postinst> `abort-remove' -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 === 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 @@ -#!/bin/sh -# postrm script for cantarell-fonts -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postrm> `remove' -# * <postrm> `purge' -# * <old-postrm> `upgrade' <new-version> -# * <new-postrm> `failed-upgrade' <old-version> -# * <new-postrm> `abort-install' -# * <new-postrm> `abort-install' <old-version> -# * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <overwriter> -# <overwriter-version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 === 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 @@ -#!/bin/sh -# preinst script for cantarell-fonts -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <new-preinst> `install' -# * <new-preinst> `install' <old-version> -# * <new-preinst> `upgrade' <old-version> -# * <old-preinst> `abort-upgrade' <new-version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 === 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 @@ -#!/bin/sh -# prerm script for cantarell-fonts -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <prerm> `remove' -# * <old-prerm> `upgrade' <new-version> -# * <new-prerm> `failed-upgrade' <old-version> -# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> -# * <deconfigured's-prerm> `deconfigure' `in-favour' -# <package-being-installed> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 === 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 @@ #!/usr/bin/make -f - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - touch $@ - -clean: - dh_testdir - #dh_testroot - rm -f build-stamp configure-stamp - rm -rf debian/cantarell-fonts - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs debian/changelog - dh_installdocs - dh_link - dh_compress - dh_fixperms - dh_installdeb - mkdir -p $(CURDIR)/debian/cantarell-fonts - cp -rf $(CURDIR)/src/* $(CURDIR)/debian/cantarell-fonts/ - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-arch: build install - touch debian/cantarell-fonts - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install - - +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + +get-orig-source: + # Uscan will read debian/watch, grab the correct version, repack, and leave it in the + # current directory + uscan --noconf --force-download --rename --repack --download-current-version --destdir=. === 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 @@ +3.0 (native) === 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 @@ +version=3 + +http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/([0-9].*)/cantarell-fonts-([0-9].*).tar.gz === 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' Binary 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' Binary 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' Binary 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' Binary 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
-- Mailing list: https://launchpad.net/~ubuntugnometeam Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntugnometeam More help : https://help.launchpad.net/ListHelp
