[SCM] librdf-vcard-perl Debian packaging branch, master, updated. debian/0.010-1-14-gbf63844
Jonas Smedegaard
dr at jones.dk
Sat May 11 08:38:06 UTC 2013
The following commit has been merged in the master branch:
commit e42412127047b7ebb07f79720733167e21432dd0
Author: Jonas Smedegaard <dr at jones.dk>
Date: Sat May 11 10:23:40 2013 +0200
Revert wrong fix for lintian warning.
This reverts commit 3c9ef5437b8876630ca04d7e362dfe30a816f6f3.
Conflicts (resolved manually):
debian/copyright
diff --git a/debian/copyright b/debian/copyright
index 2b409f2..4a6bc7f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -69,20 +69,12 @@ Copyright: 2011-2013, Jonas Smedegaard <dr at jones.dk>
License: GPL-3+
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 GNU 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
--
librdf-vcard-perl Debian packaging
More information about the Pkg-perl-cvs-commits
mailing list