[SCM] Debian packaging of libflickr-api-perl branch, master, updated. upstream/1.05-55-g4144ac9

[Xavier Guimard]

The following commit has been merged in the master branch:
commit 7dc1e39dcedd89a34d375956028a3e64b01c4823
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sun Mar 31 09:15:39 2013 +0200

    Change back debian/* license

diff --git a/debian/changelog b/debian/changelog
index 8fa59c8..abaaf5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,7 +31,6 @@ libflickr-api-perl (1.05-1) UNRELEASED; urgency=low
   * 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
   * Remove "--with-quilt" old arg from debian/rules
   * Update patch description
 
diff --git a/debian/copyright b/debian/copyright
index 31cf68b..5e01d1d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,7 +16,23 @@ Copyright: 2007, Jose Luis Rivas <ghostbar38 at gmail.com>
  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 or 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 systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
+
+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 systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
 
 License: Artistic-2.0
  		       The Artistic License 2.0

-- 
Debian packaging of libflickr-api-perl