r34284 - in /desktop/unstable/gnome-user-docs/debian: changelog copyright

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Mon Apr 16 21:53:53 2012
New Revision: 34284

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34284
Log:
debian/copyright: Move to copyright 1.0 format.

Modified:
    desktop/unstable/gnome-user-docs/debian/changelog
    desktop/unstable/gnome-user-docs/debian/copyright

Modified: desktop/unstable/gnome-user-docs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-docs/debian/changelog?rev=34284&op=diff
==============================================================================
--- desktop/unstable/gnome-user-docs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-user-docs/debian/changelog [utf-8] Mon Apr 16 21:53:53 2012
@@ -1,6 +1,7 @@
 gnome-user-docs (3.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/copyright: Move to copyright 1.0 format.
 
  -- Martin Pitt <mpitt at debian.org>  Mon, 16 Apr 2012 23:50:38 +0200
 

Modified: desktop/unstable/gnome-user-docs/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-docs/debian/copyright?rev=34284&op=diff
==============================================================================
--- desktop/unstable/gnome-user-docs/debian/copyright [utf-8] (original)
+++ desktop/unstable/gnome-user-docs/debian/copyright [utf-8] Mon Apr 16 21:53:53 2012
@@ -1,37 +1,11 @@
-This package was first debianized by Christian Marillat <marillat at debian.org> on
-Fri,  4 May 2001 14:56:35 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-user-docs/
 
-Currently it is maintained by Jose Carlos Garcia Sogo <jsogo at debian.org>
-within the Gnome Debian Team http://pkg-gnome.alioth.debian.org
+Files: *
+Copyright: Copyright (C) 2010 - 2011 Shaun McCance
+License: CC-BY-SA 3.0
+ This work is licenced under the Creative Commons Attribution 3.0 United
+ States License. To view a copy of this licence, visit
+ http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative
+ Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.
 
-It was downloaded from: http://ftp.gnome.org/pub/GNOME/sources/gnome-user-docs/
-
-Upstream Authors:
-  (as listed in the user guide pages)
-  April Gonzales
-  Cristopher Thomas
-  Jim Campbell
-  Natalia Ruz
-  Paul W. Frields
-  Phil Bull
-  Shaun McCance
-  Tiffany Antopolski
-  and
-  Contributors to the Ubuntu documentation wiki
-  GNOME Documentation Team
-
-Copyright:
-
-+ gnome-help/C/*.page
-    - Copyright (C) 2010 - 2011 Shaun McCance
-
-This license statement applies for all of these documents, including
-the translations:
-
-  Creative Commons Share Alike 3.0
-
-  This work is licenced under the Creative Commons Attribution 3.0 United
-  States License. To view a copy of this licence, visit
-  http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative
-  Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.
-