[SCM] Debian packaging of libflickr-api-perl branch, master, updated. f02bf8449dfe05cb4208838ee4fe2471d0e06022

[Xavier Guimard]

The following commit has been merged in the master branch:
commit 35647708bd75c9383d5888d3e0d01938e25c1c1e
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sun Nov 25 16:35:37 2012 +0100

    Update debian/copyright (years and format)

diff --git a/debian/changelog b/debian/changelog
index c7ea555..c21ae10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,22 +5,15 @@ libflickr-api-perl (1.05-1) UNRELEASED; urgency=low
     + Relicensed under Perl Artistic v 2.0
   * Added myself to Uploaders, updated Copyright
   * Added full text of Artistic2 to copyright; not in common-licenses
-  * Relicensed debian/* under Artistic | GPL-1+ (I assume this is OK
-    since this is what our other packages follow; previously it was
-    under Artistic, which was the old license)
-  * Updated to short debhelper format (dh >= 7.0.8, quilt >= 0.46-7)
-  * Added a README.source
 
   [ gregor herrmann ]
-  * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
-    (source stanza).
   * debian/control: Added: ${misc:Depends} to Depends: field.
 
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
 
   [ Ryan Niebur ]
-  * Update jawnsy's email address
+  * Email change: Jonathan Yu -> jawnsy at cpan.org
 
   [ gregor herrmann ]
   * debian/rules: switch order of arguments to dh.
@@ -37,6 +30,8 @@ libflickr-api-perl (1.05-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.4
   * Use debhelper 8
   * Remove libcompress-zlib-perl from dependencies (now included in Perl)
+  * Update debian/copyright (years and format)
+  * Change debian/* license to Artistic-2.0
 
  -- Xavier Guimard <x.guimard at free.fr>  Sun, 25 Nov 2012 16:12:26 +0100
 
diff --git a/debian/copyright b/debian/copyright
index e1fb730..f2eba61 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,22 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Cal Henderson <cal at iamcal.com>
-Upstream-Source: http://search.cpan.org/dist/Flickr-API/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Flickr-API
+Source: http://search.cpan.org/dist/Flickr-API/
+Upstream-Contact: Cal Henderson <cal at iamcal.com>
 
 Files: *
-Copyright: 2004-2009, Cal Henderson <cal at iamcal.com>
+Copyright: 2004-2012, Cal Henderson <cal at iamcal.com>
 License: Artistic-2.0
 
 Files: debian/*
-Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
- 2008, various members of the Debian Perl Group, cf. debian/copyright
- 2007, Jose Luis Rivas <ghostbar38 at gmail.com>
-License: Artistic | GPL-1+
-
-License: Artistic
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Artistic License, which comes with Perl.
-    On Debian GNU/Linux systems, the complete text of the Artistic License
-    can be found in `/usr/share/common-licenses/Artistic'
+Copyright: 2007, Jose Luis Rivas <ghostbar38 at gmail.com>
+ 2008, Gunnar Wolf <gwolf at debian.org>
+ 2008, gregor herrmann <gregoa at debian.org>
+ 2009, Ryan Niebur <ryanryan52 at gmail.com>
+ 2009, Jonathan Yu <jawnsy at cpan.org>
+ 2009, Ansgar Burchardt <ansgar at debian.org>
+ 2009, Nathan Handler <nhandler at debian.org>
+ 2012, Xavier Guimard <x.guimard at free.fr>
+License: Artistic-2.0
 
 License: Artistic-2.0
     Copyright (c) 2000-2006, The Perl Foundation.
@@ -192,10 +190,3 @@ License: Artistic-2.0
     INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE
     OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: GPL-1+
-    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 1, or (at your option)
-    any later version.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'

-- 
Debian packaging of libflickr-api-perl