r39383 - in /desktop/unstable/cheese/debian: changelog control control.in copyright patches/fix-help-license.patch patches/fix-um-crop-license.patch patches/series
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Wed Aug 28 18:08:57 UTC 2013
Author: jbicha-guest
Date: Wed Aug 28 18:08:56 2013
New Revision: 39383
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39383
Log:
* debian/patches/fix-help-license.patch:
- Backport clarification that the help files are licensed CC-BY-SA 3.0
* debian/patches/fix-um-crop-license.patch:
- Backport relicensing of this file as GPL-2+ instead of GPL-3+
* debian/copyright:
- Updated and converted to the 1.0 copyright format
* debian/control.in:
- Suggest gnome-video-effects-frei0r
Added:
desktop/unstable/cheese/debian/patches/fix-help-license.patch
desktop/unstable/cheese/debian/patches/fix-um-crop-license.patch
Modified:
desktop/unstable/cheese/debian/changelog
desktop/unstable/cheese/debian/control
desktop/unstable/cheese/debian/control.in
desktop/unstable/cheese/debian/copyright
desktop/unstable/cheese/debian/patches/series
Modified: desktop/unstable/cheese/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/changelog?rev=39383&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/changelog [utf-8] (original)
+++ desktop/unstable/cheese/debian/changelog [utf-8] Wed Aug 28 18:08:56 2013
@@ -1,3 +1,16 @@
+cheese (3.8.3-2) UNRELEASED; urgency=low
+
+ * debian/patches/fix-help-license.patch:
+ - Backport clarification that the help files are licensed CC-BY-SA 3.0
+ * debian/patches/fix-um-crop-license.patch:
+ - Backport relicensing of this file as GPL-2+ instead of GPL-3+
+ * debian/copyright:
+ - Updated and converted to the 1.0 copyright format
+ * debian/control.in:
+ - Suggest gnome-video-effects-frei0r
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Wed, 28 Aug 2013 14:03:15 -0400
+
cheese (3.8.3-1) unstable; urgency=low
[ Jeremy Bicha ]
Modified: desktop/unstable/cheese/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/control?rev=39383&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/control [utf-8] (original)
+++ desktop/unstable/cheese/debian/control [utf-8] Wed Aug 28 18:08:56 2013
@@ -56,6 +56,7 @@
hicolor-icon-theme,
nautilus-sendto,
yelp
+Suggests: gnome-video-effects-frei0r
Description: tool to take pictures and videos from your webcam
A webcam application that supports image and video capture. Makes
it easy to take photos and videos of you, your friends, pets or whatever
Modified: desktop/unstable/cheese/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/control.in?rev=39383&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/control.in [utf-8] (original)
+++ desktop/unstable/cheese/debian/control.in [utf-8] Wed Aug 28 18:08:56 2013
@@ -51,6 +51,7 @@
hicolor-icon-theme,
nautilus-sendto,
yelp
+Suggests: gnome-video-effects-frei0r
Description: tool to take pictures and videos from your webcam
A webcam application that supports image and video capture. Makes
it easy to take photos and videos of you, your friends, pets or whatever
Modified: desktop/unstable/cheese/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/copyright?rev=39383&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/copyright [utf-8] (original)
+++ desktop/unstable/cheese/debian/copyright [utf-8] Wed Aug 28 18:08:56 2013
@@ -1,20 +1,16 @@
-This package was debianized by Baptiste Mille-Mathias <baptiste.millemathias at gmail.com> on
-Tue, 10 Jul 2007 21:15:54 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cheese
+Source: http://ftp.gnome.org/pub/GNOME/sources/cheese/
-It was downloaded from http://live.gnome.org/Cheese/Releases
-
-Upstream Authors:
-
- Daniel G. Siegel <dgsiegel at gmail.com>
- Jaap Haitsma <jaap at haitsma.org>
-
+Files: *
Copyright: 2000 Eazel, Inc.
2000-2007 The Free Software Foundation
2002-2004 Marco Pesenti Gritti
2004, 2006 Christian Persch
- 2007-2008 Daniel G. Siegel <dgsiegel at gmail.com>
+ 2007-2011 Daniel G. Siegel <dgsiegel at gmail.com>
2007-2008 Jaap Haitsma <jaap at haitsma.org>
2007 Gintautas Miliauskas <gintas at akl.lt>
+ 2007 Mathias Hasselmann <mathias.hasselmann at gmx.de>
2008 Patryk Zawadzki <patrys at pld-linux.org>
2008 Mirco "MacSlow" Müller
2008 Ihar Hrachyshka, 2008.
@@ -22,78 +18,411 @@
2008 James Liggett <jrliggett at cox.net>
2008 Ryan Zeigler <zeiglerr at gmail.com>
2008 Alexander “weej” Jones <alex at weej.com>
- Andrea Cimitan <andrea.cimitan at gmail.com>
+ 2008 Andrea Cimitan <andrea.cimitan at gmail.com>
2008 Patryk Zawadzki <patrys at pld-linux.org>
2008 Thomas Perl <thp at thpinfo.com>
- 2009 Filippo Argiolas <filippo.argiolas at gmail.com>
- 2007 Mathias Hasselmann <mathias.hasselmann at gmx.de>
+ 2008-2009 Filippo Argiolas <filippo.argiolas at gmail.com>
2008 Felix Kaser <f.kaser at gmx.net>
2008 Sebastian Keller <sebastian-keller at gmx.de>
+ 2010 Yuvaraj Pandian T <yuvipanda at yuvi.in>
+ 2008-2013 Hans de Goede <hdegoede at redhat.com>
+ 2011-2012 Raluca Elena Podiuc <ralucaelena1985 at gmail.com>
+ 2010-2013 Luciana Fujii Pontello <luciana at fujii.eti.br>
+ 2011-2013 David King <amigadave at amigadave.com>
+ 2011 Lucas Baudin <xapantu at gmail.com>
+License: GPL-2.0+
+ 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".
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'
-
-The files src/gst-audio-play.{c,h} are copyright:
- 2007 Mathias Hasselmann <mathias.hasselmann at gmx.de>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian systems, the complete text of the GNU Library General
-Public License can be found in `/usr/share/common-licenses/LGPL
-
-The documentation in help/* is copyright:
- 2007 Daniel G. Siegel <dgsiegel at gmail.com>
- 2007 Jaap Haitsma <jaap at haitsma.org>
- 2007 Daniel Nylander (po at danielnylander.se)
- 2007-2008 Jorge González (jorgegonz at svn.gnome.org)
- 2008 Bruno Brouard (annoa.b at gmail.com)
- 2008 Claude Paroz (claude at 2xlibre.net)
- 2008 Василий Фаронов <qvvx at yandex.ru>
-
- All these files are covered by the GFDL and contain no unmodifiable sections
-
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the GNU Free Documentation
- License (GFDL), Version 1.1 or any later version published
- by the Free Software Foundation with no Invariant Sections,
- no Front-Cover Texts, and no Back-Cover Texts
-
-On Debian systems, the complete text of the GFDL can be found in
-`/usr/share/common-licenses/GFDL'
-
-Some part of the build system are covered by the M.I.T license
-
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name of M.I.T. not be used in advertising or
- publicity pertaining to distribution of the software without specific,
- written prior permission. M.I.T. makes no representations about the
- suitability of this software for any purpose. It is provided "as is"
- without express or implied warranty.
-
-The Debian packaging is Copyright (C) 2007, Baptiste Mille-Mathias
-<baptiste.millemathias at gmail.com> and is licensed under the GPL, see
-`/usr/share/common-licenses/GPL'.
+Files: help/*
+Copyright: 2011 Julita Inca <yrazes at gmail.com>
+ 2011-2013 Ekaterina Gerasimova <kittykat3756 at gmail.com>
+License: CC-BY-SA-3.0
+ Creative Commons Attribution-ShareAlike 3.0 Unported
+ .
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
+ ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE
+ INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ ITS USE.
+ .
+ License
+ .
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+ COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+ COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+ AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+ TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+ BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+ CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+ CONDITIONS.
+ .
+ 1. Definitions
+ .
+ a. "Adaptation" means a work based upon the Work, or upon the Work and
+ other pre-existing works, such as a translation, adaptation, derivative
+ work, arrangement of music or other alterations of a literary or
+ artistic work, or phonogram or performance and includes cinematographic
+ adaptations or any other form in which the Work may be recast,
+ transformed, or adapted including in any form recognizably derived from
+ the original, except that a work that constitutes a Collection will not
+ be considered an Adaptation for the purpose of this License. For the
+ avoidance of doubt, where the Work is a musical work, performance or
+ phonogram, the synchronization of the Work in timed-relation with a
+ moving image ("synching") will be considered an Adaptation for the
+ purpose of this License.
+ .
+ b. "Collection" means a collection of literary or artistic works, such
+ as encyclopedias and anthologies, or performances, phonograms or
+ broadcasts, or other works or subject matter other than works listed in
+ Section 1(f) below, which, by reason of the selection and arrangement of
+ their contents, constitute intellectual creations, in which the Work is
+ included in its entirety in unmodified form along with one or more other
+ contributions, each constituting separate and independent works in
+ themselves, which together are assembled into a collective whole. A work
+ that constitutes a Collection will not be considered an Adaptation (as
+ defined below) for the purposes of this License.
+ .
+ c. "Creative Commons Compatible License" means a license that is listed
+ at http://creativecommons.org/compatiblelicenses that has been approved
+ by Creative Commons as being essentially equivalent to this License,
+ including, at a minimum, because that license: (i) contains terms that
+ have the same purpose, meaning and effect as the License Elements of
+ this License; and, (ii) explicitly permits the relicensing of
+ adaptations of works made available under that license under this
+ License or a Creative Commons jurisdiction license with the same License
+ Elements as this License.
+ .
+ d. "Distribute" means to make available to the public the original and
+ copies of the Work or Adaptation, as appropriate, through sale or other
+ transfer of ownership.
+ .
+ e. "License Elements" means the following high-level license attributes
+ as selected by Licensor and indicated in the title of this License:
+ Attribution, ShareAlike.
+ .
+ f. "Licensor" means the individual, individuals, entity or entities that
+ offer(s) the Work under the terms of this License.
+ .
+ g. "Original Author" means, in the case of a literary or artistic work,
+ the individual, individuals, entity or entities who created the Work or
+ if no individual or entity can be identified, the publisher; and in
+ addition (i) in the case of a performance the actors, singers,
+ musicians, dancers, and other persons who act, sing, deliver, declaim,
+ play in, interpret or otherwise perform literary or artistic works or
+ expressions of folklore; (ii) in the case of a phonogram the producer
+ being the person or legal entity who first fixes the sounds of a
+ performance or other sounds; and, (iii) in the case of broadcasts, the
+ organization that transmits the broadcast.
+ .
+ h. "Work" means the literary and/or artistic work offered under the
+ terms of this License including without limitation any production in the
+ literary, scientific and artistic domain, whatever may be the mode or
+ form of its expression including digital form, such as a book, pamphlet
+ and other writing; a lecture, address, sermon or other work of the same
+ nature; a dramatic or dramatico-musical work; a choreographic work or
+ entertainment in dumb show; a musical composition with or without words;
+ a cinematographic work to which are assimilated works expressed by a
+ process analogous to cinematography; a work of drawing, painting,
+ architecture, sculpture, engraving or lithography; a photographic work
+ to which are assimilated works expressed by a process analogous to
+ photography; a work of applied art; an illustration, map, plan, sketch
+ or three-dimensional work relative to geography, topography,
+ architecture or science; a performance; a broadcast; a phonogram; a
+ compilation of data to the extent it is protected as a copyrightable
+ work; or a work performed by a variety or circus performer to the extent
+ it is not otherwise considered a literary or artistic work.
+ .
+ i. "You" means an individual or entity exercising rights under this
+ License who has not previously violated the terms of this License with
+ respect to the Work, or who has received express permission from the
+ Licensor to exercise rights under this License despite a previous
+ violation.
+ .
+ j. "Publicly Perform" means to perform public recitations of the Work
+ and to communicate to the public those public recitations, by any means
+ or process, including by wire or wireless means or public digital
+ performances; to make available to the public Works in such a way that
+ members of the public may access these Works from a place and at a place
+ individually chosen by them; to perform the Work to the public by any
+ means or process and the communication to the public of the performances
+ of the Work, including by public digital performance; to broadcast and
+ rebroadcast the Work by any means including signs, sounds or images.
+ .
+ k. "Reproduce" means to make copies of the Work by any means including
+ without limitation by sound or visual recordings and the right of
+ fixation and reproducing fixations of the Work, including storage of a
+ protected performance or phonogram in digital form or other electronic
+ medium.
+ .
+ 2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+ limit, or restrict any uses free from copyright or rights arising from
+ limitations or exceptions that are provided for in connection with the
+ copyright protection under copyright law or other applicable laws.
+ .
+ 3. License Grant. Subject to the terms and conditions of this License,
+ Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+ perpetual (for the duration of the applicable copyright) license to
+ exercise the rights in the Work as stated below:
+ .
+ a. to Reproduce the Work, to incorporate the Work into one or more
+ Collections, and to Reproduce the Work as incorporated in the
+ Collections;
+ .
+ b. to create and Reproduce Adaptations provided that any such
+ Adaptation, including any translation in any medium, takes reasonable
+ steps to clearly label, demarcate or otherwise identify that changes
+ were made to the original Work. For example, a translation could be
+ marked "The original work was translated from English to Spanish," or a
+ modification could indicate "The original work has been modified.";
+ .
+ c. to Distribute and Publicly Perform the Work including as incorporated
+ in Collections; and,
+ .
+ d. to Distribute and Publicly Perform Adaptations.
+ .
+ e. For the avoidance of doubt:
+ .
+ i. Non-waivable Compulsory License Schemes. In those jurisdictions in
+ which the right to collect royalties through any statutory or compulsory
+ licensing scheme cannot be waived, the Licensor reserves the exclusive
+ right to collect such royalties for any exercise by You of the rights
+ granted under this License;
+ .
+ ii. Waivable Compulsory License Schemes. In those jurisdictions in which
+ the right to collect royalties through any statutory or compulsory
+ licensing scheme can be waived, the Licensor waives the exclusive right
+ to collect such royalties for any exercise by You of the rights granted
+ under this License; and,
+ .
+ iii. Voluntary License Schemes. The Licensor waives the right to collect
+ royalties, whether individually or, in the event that the Licensor is a
+ member of a collecting society that administers voluntary licensing
+ schemes, via that society, from any exercise by You of the rights
+ granted under this License.
+ .
+ The above rights may be exercised in all media and formats whether now
+ known or hereafter devised. The above rights include the right to make
+ such modifications as are technically necessary to exercise the rights
+ in other media and formats. Subject to Section 8(f), all rights not
+ expressly granted by Licensor are hereby reserved.
+ .
+ 4. Restrictions. The license granted in Section 3 above is expressly
+ made subject to and limited by the following restrictions:
+ .
+ a. You may Distribute or Publicly Perform the Work only under the terms
+ of this License. You must include a copy of, or the Uniform Resource
+ Identifier (URI) for, this License with every copy of the Work You
+ Distribute or Publicly Perform. You may not offer or impose any terms on
+ the Work that restrict the terms of this License or the ability of the
+ recipient of the Work to exercise the rights granted to that recipient
+ under the terms of the License. You may not sublicense the Work. You
+ must keep intact all notices that refer to this License and to the
+ disclaimer of warranties with every copy of the Work You Distribute or
+ Publicly Perform. When You Distribute or Publicly Perform the Work, You
+ may not impose any effective technological measures on the Work that
+ restrict the ability of a recipient of the Work from You to exercise the
+ rights granted to that recipient under the terms of the License. This
+ Section 4(a) applies to the Work as incorporated in a Collection, but
+ this does not require the Collection apart from the Work itself to be
+ made subject to the terms of this License. If You create a Collection,
+ upon notice from any Licensor You must, to the extent practicable,
+ remove from the Collection any credit as required by Section 4(c), as
+ requested. If You create an Adaptation, upon notice from any Licensor
+ You must, to the extent practicable, remove from the Adaptation any
+ credit as required by Section 4(c), as requested.
+ .
+ b. You may Distribute or Publicly Perform an Adaptation only under the
+ terms of: (i) this License; (ii) a later version of this License with
+ the same License Elements as this License; (iii) a Creative Commons
+ jurisdiction license (either this or a later license version) that
+ contains the same License Elements as this License (e.g.,
+ Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible
+ License. If you license the Adaptation under one of the licenses
+ mentioned in (iv), you must comply with the terms of that license. If
+ you license the Adaptation under the terms of any of the licenses
+ mentioned in (i), (ii) or (iii) (the "Applicable License"), you must
+ comply with the terms of the Applicable License generally and the
+ following provisions: (I) You must include a copy of, or the URI for,
+ the Applicable License with every copy of each Adaptation You Distribute
+ or Publicly Perform; (II) You may not offer or impose any terms on the
+ Adaptation that restrict the terms of the Applicable License or the
+ ability of the recipient of the Adaptation to exercise the rights
+ granted to that recipient under the terms of the Applicable License;
+ (III) You must keep intact all notices that refer to the Applicable
+ License and to the disclaimer of warranties with every copy of the Work
+ as included in the Adaptation You Distribute or Publicly Perform; (IV)
+ when You Distribute or Publicly Perform the Adaptation, You may not
+ impose any effective technological measures on the Adaptation that
+ restrict the ability of a recipient of the Adaptation from You to
+ exercise the rights granted to that recipient under the terms of the
+ Applicable License. This Section 4(b) applies to the Adaptation as
+ incorporated in a Collection, but this does not require the Collection
+ apart from the Adaptation itself to be made subject to the terms of the
+ Applicable License.
+ .
+ c. If You Distribute, or Publicly Perform the Work or any Adaptations or
+ Collections, You must, unless a request has been made pursuant to
+ Section 4(a), keep intact all copyright notices for the Work and
+ provide, reasonable to the medium or means You are utilizing: (i) the
+ name of the Original Author (or pseudonym, if applicable) if supplied,
+ and/or if the Original Author and/or Licensor designate another party or
+ parties (e.g., a sponsor institute, publishing entity, journal) for
+ attribution ("Attribution Parties") in Licensor's copyright notice,
+ terms of service or by other reasonable means, the name of such party or
+ parties; (ii) the title of the Work if supplied; (iii) to the extent
+ reasonably practicable, the URI, if any, that Licensor specifies to be
+ associated with the Work, unless such URI does not refer to the
+ copyright notice or licensing information for the Work; and (iv) ,
+ consistent with Ssection 3(b), in the case of an Adaptation, a credit
+ identifying the use of the Work in the Adaptation (e.g., "French
+ translation of the Work by Original Author," or "Screenplay based on
+ original Work by Original Author"). The credit required by this Section
+ 4(c) may be implemented in any reasonable manner; provided, however,
+ that in the case of a Adaptation or Collection, at a minimum such credit
+ will appear, if a credit for all contributing authors of the Adaptation
+ or Collection appears, then as part of these credits and in a manner at
+ least as prominent as the credits for the other contributing authors.
+ For the avoidance of doubt, You may only use the credit required by this
+ Section for the purpose of attribution in the manner set out above and,
+ by exercising Your rights under this License, You may not implicitly or
+ explicitly assert or imply any connection with, sponsorship or
+ endorsement by the Original Author, Licensor and/or Attribution Parties,
+ as appropriate, of You or Your use of the Work, without the separate,
+ express prior written permission of the Original Author, Licensor and/or
+ Attribution Parties.
+ .
+ d. Except as otherwise agreed in writing by the Licensor or as may be
+ otherwise permitted by applicable law, if You Reproduce, Distribute or
+ Publicly Perform the Work either by itself or as part of any Adaptations
+ or Collections, You must not distort, mutilate, modify or take other
+ derogatory action in relation to the Work which would be prejudicial to
+ the Original Author's honor or reputation. Licensor agrees that in those
+ jurisdictions (e.g. Japan), in which any exercise of the right granted
+ in Section 3(b) of this License (the right to make Adaptations) would be
+ deemed to be a distortion, mutilation, modification or other derogatory
+ action prejudicial to the Original Author's honor and reputation, the
+ Licensor will waive or not assert, as appropriate, this Section, to the
+ fullest extent permitted by the applicable national law, to enable You
+ to reasonably exercise Your right under Section 3(b) of this License
+ (right to make Adaptations) but not otherwise.
+ .
+ 5. Representations, Warranties and Disclaimer
+ .
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+ OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+ KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+ LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+ WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE
+ EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+ .
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+ LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
+ BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. Termination
+ .
+ a. This License and the rights granted hereunder will terminate
+ automatically upon any breach by You of the terms of this License.
+ Individuals or entities who have received Adaptations or Collections
+ from You under this License, however, will not have their licenses
+ terminated provided such individuals or entities remain in full
+ compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+ survive any termination of this License.
+ .
+ b. Subject to the above terms and conditions, the license granted here
+ is perpetual (for the duration of the applicable copyright in the Work).
+ Notwithstanding the above, Licensor reserves the right to release the
+ Work under different license terms or to stop distributing the Work at
+ any time; provided, however that any such election will not serve to
+ withdraw this License (or any other license that has been, or is
+ required to be, granted under the terms of this License), and this
+ License will continue in full force and effect unless terminated as
+ stated above.
+ .
+ 8. Miscellaneous
+ .
+ a. Each time You Distribute or Publicly Perform the Work or a
+ Collection, the Licensor offers to the recipient a license to the Work
+ on the same terms and conditions as the license granted to You under
+ this License.
+ .
+ b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
+ offers to the recipient a license to the original Work on the same terms
+ and conditions as the license granted to You under this License.
+ .
+ c. If any provision of this License is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of
+ the remainder of the terms of this License, and without further action
+ by the parties to this agreement, such provision shall be reformed to
+ the minimum extent necessary to make such provision valid and
+ enforceable.
+ .
+ d. No term or provision of this License shall be deemed waived and no
+ breach consented to unless such waiver or consent shall be in writing
+ and signed by the party to be charged with such waiver or consent.
+ .
+ e. This License constitutes the entire agreement between the parties
+ with respect to the Work licensed here. There are no understandings,
+ agreements or representations with respect to the Work not specified
+ here. Licensor shall not be bound by any additional provisions that may
+ appear in any communication from You. This License may not be modified
+ without the mutual written agreement of the Licensor and You.
+ .
+ f. The rights granted under, and the subject matter referenced, in this
+ License were drafted utilizing the terminology of the Berne Convention
+ for the Protection of Literary and Artistic Works (as amended on
+ September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
+ Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and
+ the Universal Copyright Convention (as revised on July 24, 1971). These
+ rights and subject matter take effect in the relevant jurisdiction in
+ which the License terms are sought to be enforced according to the
+ corresponding provisions of the implementation of those treaty
+ provisions in the applicable national law. If the standard suite of
+ rights granted under applicable copyright law includes additional rights
+ not granted under this License, such additional rights are deemed to be
+ included in the License; this License is not intended to restrict the
+ license of any rights under applicable law.
+ .
+ Creative Commons Notice
+ .
+ Creative Commons is not a party to this License, and makes no warranty
+ whatsoever in connection with the Work. Creative Commons will not be
+ liable to You or any party on any legal theory for any damages
+ whatsoever, including without limitation any general, special,
+ incidental or consequential damages arising in connection to this
+ license. Notwithstanding the foregoing two (2) sentences, if Creative
+ Commons has expressly identified itself as the Licensor hereunder, it
+ shall have all rights and obligations of Licensor.
+ .
+ Except for the limited purpose of indicating to the public that the Work
+ is licensed under the CCPL, Creative Commons does not authorize the use
+ by either party of the trademark "Creative Commons" or any related
+ trademark or logo of Creative Commons without the prior written consent
+ of Creative Commons. Any permitted use will be in compliance with
+ Creative Commons' then-current trademark usage guidelines, as may be
+ published on its website or otherwise made available upon request from
+ time to time. For the avoidance of doubt, this trademark restriction
+ does not form part of the License.
+ .
+ Creative Commons may be contacted at http://creativecommons.org/.
Added: desktop/unstable/cheese/debian/patches/fix-help-license.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/patches/fix-help-license.patch?rev=39383&op=file
==============================================================================
--- desktop/unstable/cheese/debian/patches/fix-help-license.patch (added)
+++ desktop/unstable/cheese/debian/patches/fix-help-license.patch [utf-8] Wed Aug 28 18:08:56 2013
@@ -0,0 +1,247 @@
+From a4dbb82074231322d099c9943d7f2929dc711173 Mon Sep 17 00:00:00 2001
+From: David King <amigadave at amigadave.com>
+Date: Fri, 28 Jun 2013 13:20:02 +0100
+Subject: [PATCH] License help under CC-BY-SA 3.0 Unported
+
+The help was not explicitly under a license, as described in bug 703238.
+Specify the license as CC-BY-SA 3.0 to match with other GNOME help:
+
+https://wiki.gnome.org/DocumentationProject/Licensing
+
+License clarification approved by help contributors (found with
+"git shortlog help/C/*.page") as listed below:
+
+Signed-off-by: Jeremy Bicha <jbicha at ubuntu.com>
+Signed-off-by: Ekaterina Gerasimova <kittykat3756 at gmail.com>
+Signed-off-by: Michael Hill <mdhill at gnome.org>
+Signed-off-by: Tiffany Ann Antopolski <tiffany.antopolski at gmail.com>
+Signed-off-by: Julita Inca <jinca at gnome.org>
+---
+ help/C/burst-mode.page | 2 ++
+ help/C/effects-apply.page | 2 ++
+ help/C/index.page | 2 ++
+ help/C/introduction.page | 2 ++
+ help/C/legal.xml | 8 ++++++++
+ help/C/photo-delete.page | 2 ++
+ help/C/photo-save.page | 2 ++
+ help/C/photo-take.page | 2 ++
+ help/C/photo-view.page | 2 ++
+ help/C/pref-countdown.page | 2 ++
+ help/C/pref-flash.page | 2 ++
+ help/C/pref-fullscreen.page | 2 ++
+ help/C/pref-image-properties.page | 2 ++
+ help/C/pref-resolution.page | 2 ++
+ help/C/video-record.page | 2 ++
+ help/Makefile.am | 1 +
+ 21 files changed, 47 insertions(+)
+ create mode 100644 help/C/legal.xml
+
+diff --git a/help/C/burst-mode.page b/help/C/burst-mode.page
+index c0d64ed..c53593b 100644
+--- a/help/C/burst-mode.page
++++ b/help/C/burst-mode.page
+@@ -20,6 +20,8 @@
+ <email its:translate="no">kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc><gui>Burst mode</gui> takes several photos rapidly. Change your pose
+ in between each shot!</desc>
+ </info>
+
+diff --git a/help/C/effects-apply.page b/help/C/effects-apply.page
+index 9c36128..73a0014 100644
+--- a/help/C/effects-apply.page
++++ b/help/C/effects-apply.page
+@@ -15,6 +15,8 @@
+ <email>kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>Add fun effects to your photos and videos, like turning yourself green
+ or distorting the picture like a funhouse mirror.</desc>
+ </info>
+diff --git a/help/C/index.page b/help/C/index.page
+index bfa126c..d2a0a79 100644
+--- a/help/C/index.page
++++ b/help/C/index.page
+@@ -16,6 +16,8 @@
+ <email>kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>Cheese lets you take photos and videos using your webcam. You can
+ even add special effects!</desc>
+
+diff --git a/help/C/introduction.page b/help/C/introduction.page
+index da21997..7b5e355 100644
+--- a/help/C/introduction.page
++++ b/help/C/introduction.page
+@@ -20,6 +20,8 @@
+ <email its:translate="no">kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>Introduction to the <app>Cheese</app> webcam application.</desc>
+ </info>
+
+diff --git a/help/C/legal.xml b/help/C/legal.xml
+new file mode 100644
+index 0000000..aa36246
+--- /dev/null
++++ b/help/C/legal.xml
+@@ -0,0 +1,8 @@
++<license xmlns="http://projectmallard.org/1.0/"
++ href="http://creativecommons.org/licenses/by-sa/3.0/">
++
++ <p>This work is licensed under a
++ <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
++ Attribution-ShareAlike 3.0 Unported License</link>.</p>
++
++</license>
+diff --git a/help/C/photo-delete.page b/help/C/photo-delete.page
+index 987d5bd..416f167 100644
+--- a/help/C/photo-delete.page
++++ b/help/C/photo-delete.page
+@@ -16,6 +16,8 @@
+ <email>kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>Remove photos and videos that you no longer want to keep.</desc>
+ </info>
+
+diff --git a/help/C/photo-save.page b/help/C/photo-save.page
+index c396043..11e83e1 100644
+--- a/help/C/photo-save.page
++++ b/help/C/photo-save.page
+@@ -16,6 +16,8 @@
+ <email>kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>Save a photo or video in a different folder.</desc>
+ </info>
+
+diff --git a/help/C/photo-take.page b/help/C/photo-take.page
+index 64be7ec..c3fbcce 100644
+--- a/help/C/photo-take.page
++++ b/help/C/photo-take.page
+@@ -24,6 +24,8 @@
+ <email its:translate="no">kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>Use your webcam to take photos instead of videos.</desc>
+ </info>
+
+diff --git a/help/C/photo-view.page b/help/C/photo-view.page
+index b0198ca..a133aff 100644
+--- a/help/C/photo-view.page
++++ b/help/C/photo-view.page
+@@ -16,6 +16,8 @@
+ <email>kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>Photos and videos will automatically appear in the photo stream.</desc>
+ </info>
+
+diff --git a/help/C/pref-countdown.page b/help/C/pref-countdown.page
+index 976c390..8c0e38a 100644
+--- a/help/C/pref-countdown.page
++++ b/help/C/pref-countdown.page
+@@ -19,6 +19,8 @@
+ <email its:translate="no">kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>Remove the countdown so that photos are taken instantly.</desc>
+ </info>
+
+diff --git a/help/C/pref-flash.page b/help/C/pref-flash.page
+index 5ec3f8e..5faa86e 100644
+--- a/help/C/pref-flash.page
++++ b/help/C/pref-flash.page
+@@ -19,6 +19,8 @@
+ <email its:translate="no">kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>Stop the screen from flashing white when taking a photo.</desc>
+ </info>
+
+diff --git a/help/C/pref-fullscreen.page b/help/C/pref-fullscreen.page
+index ca3ad63..c6901be 100644
+--- a/help/C/pref-fullscreen.page
++++ b/help/C/pref-fullscreen.page
+@@ -10,6 +10,8 @@
+ <email>kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>Enable and disable fullscreen mode</desc>
+ </info>
+
+diff --git a/help/C/pref-image-properties.page b/help/C/pref-image-properties.page
+index 8f32188..02daa79 100644
+--- a/help/C/pref-image-properties.page
++++ b/help/C/pref-image-properties.page
+@@ -20,6 +20,8 @@
+ <email its:translate="no">kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>Adjust the saturation, contrast, brightness and hue to make photos and videos look better.</desc>
+ </info>
+
+diff --git a/help/C/pref-resolution.page b/help/C/pref-resolution.page
+index 26bdf87..956c53c 100644
+--- a/help/C/pref-resolution.page
++++ b/help/C/pref-resolution.page
+@@ -18,6 +18,8 @@
+ <email its:translate="no">kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>The resolution of a video or photo determines how much detail you can
+ see in it, changing it will affect the file size.</desc>
+
+diff --git a/help/C/video-record.page b/help/C/video-record.page
+index 315304a..f4b01bd 100644
+--- a/help/C/video-record.page
++++ b/help/C/video-record.page
+@@ -19,6 +19,8 @@
+ <email its:translate="no">kittykat3756 at gmail.com</email>
+ </credit>
+
++ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
++
+ <desc>Use your webcam to record short movies for sharing with friends.</desc>
+ </info>
+
+diff --git a/help/Makefile.am b/help/Makefile.am
+index 60d2703..76529d6 100644
+--- a/help/Makefile.am
++++ b/help/Makefile.am
+@@ -19,6 +19,7 @@ HELP_FILES = \
+ effects-apply.page \
+ index.page \
+ introduction.page \
++ legal.xml \
+ photo-delete.page \
+ photo-save.page \
+ photo-take.page \
Added: desktop/unstable/cheese/debian/patches/fix-um-crop-license.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/patches/fix-um-crop-license.patch?rev=39383&op=file
==============================================================================
--- desktop/unstable/cheese/debian/patches/fix-um-crop-license.patch (added)
+++ desktop/unstable/cheese/debian/patches/fix-um-crop-license.patch [utf-8] Wed Aug 28 18:08:56 2013
@@ -0,0 +1,24 @@
+From 7aab154c74ee9a6487e38300d907bd797fd5ba0e Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Sun, 30 Jun 2013 01:40:26 +0000
+Subject: um-crop-area.c: Relicense to GPLv2+
+
+This makes the file fit in better with the rest of Cheese,
+license-wise.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=703239
+---
+diff --git a/libcheese/um-crop-area.c b/libcheese/um-crop-area.c
+index 8b9323d..60ca9be 100644
+--- a/libcheese/um-crop-area.c
++++ b/libcheese/um-crop-area.c
+@@ -4,7 +4,7 @@
+ *
+ * This program 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
++ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+
Modified: desktop/unstable/cheese/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cheese/debian/patches/series?rev=39383&op=diff
==============================================================================
--- desktop/unstable/cheese/debian/patches/series [utf-8] (original)
+++ desktop/unstable/cheese/debian/patches/series [utf-8] Wed Aug 28 18:08:56 2013
@@ -0,0 +1,2 @@
+fix-help-license.patch
+fix-um-crop-license.patch
More information about the pkg-gnome-commits
mailing list