[SCM] libio-html-perl Debian packaging branch, master, updated. debian/0.04-1-13-g878f860
Jonas Smedegaard
dr at jones.dk
Sun Mar 3 16:56:56 UTC 2013
The following commit has been merged in the master branch:
commit 3311f4335cd7865224c123149786d8aea4bffd02
Author: Jonas Smedegaard <dr at jones.dk>
Date: Sun Mar 3 17:54:23 2013 +0100
Revert "Add licenses texts to remove missing-license-text-in-dep5-copyright warning"
This reverts commit 38c039d846d97384ebcffa5728697eb23ddfb1f2.
Conflicts:
debian/copyright
diff --git a/debian/copyright b/debian/copyright
index 04d0242..04444af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,20 +23,12 @@ Copyright: 2012, Jonas Smedegaard <dr at jones.dk>
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.
- .
Comment:
.
On Debian systems the 'Artistic License' is located 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.
- .
Comment:
.
On Debian systems the 'GNU General Public License' version 1 is located
--
libio-html-perl Debian packaging
More information about the Pkg-perl-cvs-commits
mailing list