From 3b65f2e29e240cc836cab93db0984a6eb021a52e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 16:39:03 +0100 Subject: Adding debian version 1.2-1. Signed-off-by: Daniel Baumann --- debian/changelog | 7 +++++++ debian/copyright | 18 ++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1ff35c..dea0b18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +plzip (1.2-1) unstable; urgency=low + + * Updating copyright file. + * Merging upstream version 1.2. + + -- Daniel Baumann Mon, 15 Sep 2014 20:36:20 +0200 + plzip (1.2~rc2-1) unstable; urgency=low * Merging upstream version 1.2~rc2. diff --git a/debian/copyright b/debian/copyright index ee4a770..9b85843 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,20 +6,18 @@ Source: http://download.savannah.gnu.org/releases/lzip/ Files: * Copyright: 2006-2014 Antonio Diaz Diaz 2009 Laszlo Ersek -License: GPL-3+ +License: GPL-2+ Files: arg_parser.* Copyright: 2006-2014 Antonio Diaz Diaz -License: GPL-3+ with Library exception +License: GPL-2+ with Library exception Files: debian/* +License: GPL-2+ Copyright: 2009-2014 Daniel Baumann -License: GPL-3+ - -License: GPL-3+ 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 3 of the License, or + the Free Software Foundation, either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, @@ -31,12 +29,12 @@ License: GPL-3+ along with this program. If not, see . . The complete text of the GNU General Public License - can be found in /usr/share/common-licenses/GPL-3 file. + can be found in /usr/share/common-licenses/GPL-2 file. -License: GPL-3+ with Library exception +License: GPL-2+ with Library exception 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 3 of the License, or + the Free Software Foundation, either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, @@ -48,7 +46,7 @@ License: GPL-3+ with Library exception along with this program. If not, see . . The complete text of the GNU General Public License - can be found in /usr/share/common-licenses/GPL-3 file. + can be found in /usr/share/common-licenses/GPL-2 file. . As a special exception, you may use this file as part of a free software library without restriction. Specifically, if other files -- cgit v1.2.3