summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 05:07:34 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 05:07:34 +0000
commita16d82fbf4a43811c8181d8d7dba929feecbfbcd (patch)
tree302a491c78b0f21e6601037532c101ce7ab5aa2e
parentMerging upstream version 1.6. (diff)
downloadlunzip-a16d82fbf4a43811c8181d8d7dba929feecbfbcd.tar.xz
lunzip-a16d82fbf4a43811c8181d8d7dba929feecbfbcd.zip
Adding debian version 1.6-1.debian/1.6-1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
-rw-r--r--debian/changelog8
-rw-r--r--debian/copyright18
2 files changed, 17 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index d79c88c..c92506e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lunzip (1.6-1) unstable; urgency=low
+
+ * Merging upstream version 1.6.
+ * Updating copyright file to reflect upstreams change from GPL-3+ to
+ GPL-2+.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch> Wed, 16 Jul 2014 22:03:45 +0200
+
lunzip (1.5-1) unstable; urgency=low
* Merging upstream version 1.5.
diff --git a/debian/copyright b/debian/copyright
index d1248f1..a7a9dff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,20 +5,20 @@ Source: http://download.savannah.gnu.org/releases/lzip/
Files: *
Copyright: 2010-2014 Antonio Diaz Diaz <ant_diaz@teleline.es>
-License: GPL-3+
+License: GPL-2+
Files: carg_parser.*
Copyright: 2010-2014 Antonio Diaz Diaz <ant_diaz@teleline.es>
-License: GPL-3+ with Library exception
+License: GPL-2+ with Library exception
Files: debian/*
Copyright: 2010-2014 Daniel Baumann <mail@daniel-baumann.ch>
-License: GPL-3+
+License: GPL-2+
-License: GPL-3+
+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
- 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,
@@ -30,12 +30,12 @@ License: GPL-3+
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
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,
@@ -47,7 +47,7 @@ License: GPL-3+ with Library exception
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
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