[SCM] Debian packaging of libxml-simple-perl branch, master, updated. upstream/2.20-26-ga34a5bc

Nathan Handler nhandler at ubuntu.com
Sat Jun 23 19:36:31 UTC 2012


The following commit has been merged in the master branch:
commit a34a5bc2a289ca099e1a9fb4184e3b1f5ddd0f2f
Author: Nathan Handler <nhandler at ubuntu.com>
Date:   Sat Jun 23 14:36:43 2012 -0500

    Replace | with 'or' in License field in debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 7579922..3e1cbc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ libxml-simple-perl (2.20-1) unstable; urgency=low
   * debian/copyright:
     - Add myself to debian/* copyright
     - Use copyright-format 1.0
+      - Replace | with 'or' for License fields
     - GPL-1 is now in common-licenses, so reference that file
 
  -- Nathan Handler <nhandler at ubuntu.com>  Sat, 23 Jun 2012 13:10:27 -0500
diff --git a/debian/copyright b/debian/copyright
index 8cb2c3b..dcdae26 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source: http://search.cpan.org/dist/XML-Simple/
 
 Copyright: © 1999-2012, Grant McLean <grantm at cpan.org>
 License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: debian/*
 Copyright:
@@ -15,7 +15,7 @@ Copyright:
  © 2006-2009, Bart Martens <bartm at debian.org>
  © 2010,      Ansgar Burchardt <ansgar at debian.org>
  © 2012,      Nathan Handler <nhandler at ubuntu.com>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 License: Artistic
     This program is free software; you can redistribute it and/or modify

-- 
Debian packaging of libxml-simple-perl



More information about the Pkg-perl-cvs-commits mailing list