[SCM] Debian packaging of libfilesys-smbclient-perl branch, master, updated. upstream/3.2-51-ge33cd31

Xavier Guimard x.guimard at free.fr
Thu Jan 17 05:21:41 UTC 2013


The following commit has been merged in the master branch:
commit e33cd319b6476100647e263b3a023abefbd7c422
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Thu Jan 17 06:18:12 2013 +0100

    Fix upstream release to "same as Perl"

diff --git a/debian/changelog b/debian/changelog
index ee04297..93757ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,4 @@
-libfilesys-smbclient-perl (3.2-1) UNRELEASED; urgency=low
-
-  TODO:
-  - d/copyright: according to SmbClient.pm, the License is "same as perl",
-    i.e. Artistic | GPL-1+
-    => Since COPYING points to GPL-2+ and POD to "same as Perl", I've reported
-       a bug: https://rt.cpan.org/Ticket/Display.html?id=81835
-    => I've reported the problem to #debian-release, some of them said that
-       "Files: *" has to point to GPL-2+ and Smbclient.pm to "same as Perl"
+libfilesys-smbclient-perl (3.2-1) unstable; urgency=low
 
   [ gregor herrmann ]
   * debian/control: Added: ${misc:Depends} to Depends: field.
@@ -26,6 +18,7 @@ libfilesys-smbclient-perl (3.2-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.4
   * Use debhelper 9.20120312
   * Update debian/copyright (years and format)
+  * Fix upstream license to Artistic or GPL-1+
   * Update debian/rules to use "dh $@"
   * Add description in 10_Makefile.PL.patch
   * Add spelling and pod patch
@@ -35,7 +28,7 @@ libfilesys-smbclient-perl (3.2-1) UNRELEASED; urgency=low
   [ Salvatore Bonaccorso ]
   * Change Vcs-Git to canonical URI (git://anonscm.debian.org)
 
- -- Xavier Guimard <x.guimard at free.fr>  Sat, 08 Dec 2012 09:50:04 +0100
+ -- Xavier Guimard <x.guimard at free.fr>  Thu, 17 Jan 2013 06:17:42 +0100
 
 libfilesys-smbclient-perl (3.1-3) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 250307c..885189f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,10 @@ Upstream-Contact: Alain BARBET <alian at cpan.org>
 
 Files: *
 Copyright: 2000-2012, Alain Barbet <alian at cpan.org>
+License: Artistic or GPL-1+
+
+Files: configure
+Copyright: 1992-2002, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: debian/*
@@ -15,6 +19,22 @@ Copyright: 2003-2004, Amit Shah <amitshah at gmx.net>
  2012, Xavier Guimard <x.guimard at free.fr>
 License: GPL-2+
 
+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: GPL-2+
  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

-- 
Debian packaging of libfilesys-smbclient-perl



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