[SCM] Debian packaging of libdevel-stacktrace-perl branch, master, updated. upstream/1.3000-55-g7ff94cf

[Xavier Guimard]

The following commit has been merged in the master branch:
commit 7ff94cf5c0128b149fab2ee1e304864673a614ba
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sun Dec 30 18:13:53 2012 +0100

    Back to perl license

diff --git a/debian/changelog b/debian/changelog
index 0daade9..0ab9c0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,4 @@
-libdevel-stacktrace-perl (1.3000-1) UNRELEASED; urgency=low
-
-  TODO:
-  - "Change debian/* license to Artistic-2":
-    + why?
-    + you can't change the license of other's work without asking them
+libdevel-stacktrace-perl (1.3000-1) unstable; urgency=low
 
   [ Ansgar Burchardt ]
   * debian/control: Convert Vcs-* fields to Git.
@@ -17,13 +12,11 @@ libdevel-stacktrace-perl (1.3000-1) UNRELEASED; urgency=low
   [ Xavier Guimard ]
   * Imported Upstream version 1.3000
   * Update debian/copyright (years and format)
-  * Change debian/* license to Artistic-2 like upstream (which was already
-    protected by Artistic-2)
   * Bump Standards-Version to 3.9.4
   * Bump debhelper compatibility to 8
   * Update description (Closes: #679900)
 
- -- Xavier Guimard <x.guimard at free.fr>  Sat, 29 Dec 2012 18:09:10 +0100
+ -- Xavier Guimard <x.guimard at free.fr>  Sun, 30 Dec 2012 18:13:41 +0100
 
 libdevel-stacktrace-perl (1.2700-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 13a88df..b207abe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,23 @@ Copyright: 2002-2004, Ivan Kohler <ivan-debian at 420.am>
  2009, Nathan Handler <nhandler at debian.org>
  2010-2011, Nicholas Bamber <nicholas at periapt.co.uk>
  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 libdevel-stacktrace-perl