[Pkg-gnutls-commits] r713 - /packages/gnutls26/trunk/debian/copyright

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Wed May 20 18:31:37 2009
New Revision: 713

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=713
Log:
Update debian/copyright.

Modified:
    packages/gnutls26/trunk/debian/copyright

Modified: packages/gnutls26/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/copyright?rev=713&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/copyright (original)
+++ packages/gnutls26/trunk/debian/copyright Wed May 20 18:31:37 2009
@@ -21,6 +21,9 @@
   Yoshisato YANAGISAWA <yanagisawa at csg.is.titech.ac.jp>
   Emile Van Bergen <emile at e-advies.nl>
   Joe Orton <jorton at redhat.com>
+  Daniel Kahn Gillmor <dkg-debian.org at fifthhorseman.net>
+  David Marín Carreño <davefx at gmail.com>
+
 
 License: The main library is licensed under GNU Lesser General Public
 License (LGPL) version 2.1+, Gnutls Extra (i.e. openssl wrapper library,
@@ -31,8 +34,7 @@
 
 Copyright:
 --------------------
-/*
- * Copyright (C) 2000, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -52,50 +54,50 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
  * USA
- *
- */
 --------------------
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2001, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
  * This file is part of GNUTLS-EXTRA.
  *
- * GNUTLS-EXTRA 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
- * (at your option) any later version.
+ * GNUTLS-EXTRA 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 (at your option) any later version.
  *
- * GNUTLS-EXTRA 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.
+ * GNUTLS-EXTRA 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/>.
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 --------------------
 
 The documentation is distributed under the terms of the GNU Free
 Documentation License (FDL):
 --------------------
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
 copy of the license is included in the section entitled ``GNU Free
 Documentation License''.
+ at end quotation
 --------------------
 
 On Debian GNU/Linux systems, the complete text of the latest version of the GNU
 Lesser General Public License can be found in `/usr/share/common-licenses/LGPL'
 v2.1 of the license in `/usr/share/common-licenses/LGPL-2.1'; the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'. The GNU Free
-Documentation License is available under /usr/share/common-licenses/GFDL-1.2.
+Documentation License is available under /usr/share/common-licenses/GFDL-1.3.