r19831 - in /desktop/experimental/epiphany-webkit/debian: changelog copyright

Wed Apr 29 14:04:45 UTC 2009

Author: kov
Date: Wed Apr 29 14:04:44 2009
New Revision: 19831

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19831
Log:
updated Debian copyright

Modified:
    desktop/experimental/epiphany-webkit/debian/changelog
    desktop/experimental/epiphany-webkit/debian/copyright

Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=19831&op=diff
==============================================================================

--- desktop/experimental/epiphany-webkit/debian/changelog (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog Wed Apr 29 14:04:44 2009
@@ -1,6 +1,9 @@
 epiphany-webkit (2.27.1-1) experimental; urgency=low
 
   * New upstream release.
+  * debian/copyright:
+  - updated, with information on the help files, which are FDL, but are OK
+    to distribute, given the outcome of our last vote
   * debian/control.in:
   - build-dep on libsoup-gnome2.4-dev
   - make epiphany-webkit-dev depend on libwebkit-dev

Modified: desktop/experimental/epiphany-webkit/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/copyright?rev=19831&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/copyright (original)
+++ desktop/experimental/epiphany-webkit/debian/copyright Wed Apr 29 14:04:44 2009
@@ -16,18 +16,87 @@
     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 package; 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 contents of the help/ directory are licensed under the GNU FDL
+version 1.1 and above. On Debian systems the complete text of the GNU
+FDL can be found in `/usr/share/common-licenses/GFDL'. The following
+are the copyright holders for the various files in this directory, and
+the license block:
+
+    Copyright (C) 2003 Patanjali Somayaji
+    Copyright (C) 2003 David Bordoley
+    Copyright (C) 2005 Piers Cornwell
+    Copyright (C) 2006,2009 Reinout van Schouwen
+    Copyright (C) 2006 Victor Osadci
+    Copyright (C) 2007 Cosimo Cecchi
+    Copyright (C) 2008 Diana Horqque
+    Copyright (C) 2008 Diego Escalante Urrelo
+    Copyright (C) 2008 Loic Froidmont
+
+   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.
+
+   This manual is part of a collection of GNOME manuals
+   distributed under the GFDL.  If you want to distribute this
+   manual separately from the collection, you can do so by adding
+   a copy of the license to the manual, as described in section 6
+   of the license.
+
+   Many of the names used by companies to distinguish their
+   products and services are claimed as trademarks. Where those
+   names appear in any GNOME documentation, and the members of the
+   GNOME Documentation Project are made aware of those trademarks,
+   then the names are in capital letters or initial capital
+   letters.
+
+   DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
+   UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE
+   FURTHER UNDERSTANDING THAT:
+
+   DOCUMENT IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTY OF
+   ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
+   LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF
+   THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A
+   PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE
+   QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED
+   VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
+   MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+   INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF
+   ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+   OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO
+   USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS
+   AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND UNDER NO
+   CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT
+   (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE
+   AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+   THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY
+   SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+   ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
+   DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES
+   FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
+   MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT
+   OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF
+   THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
+   THE POSSIBILITY OF SUCH DAMAGES.
+
+  --------------------------------------------------------------------------
 
 'flashblock.tar' was checked out on Friday April 4th at 18:36 UTC with the
 following command: 'cvs -d :pserver:guest at mozdev.org:/cvs co flashblock/source'


