summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 15:39:03 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 15:39:03 +0000
commit3b65f2e29e240cc836cab93db0984a6eb021a52e (patch)
treed9d21c7c359a4e9c282f358544790cc7a47776dd
parentMerging upstream version 1.2. (diff)
downloadplzip-3b65f2e29e240cc836cab93db0984a6eb021a52e.tar.xz
plzip-3b65f2e29e240cc836cab93db0984a6eb021a52e.zip
Adding debian version 1.2-1.debian/1.2-1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r--debian/changelog7
-rw-r--r--debian/copyright18
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 <mail@daniel-baumann.ch> 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 <ant_diaz@teleline.es>
2009 Laszlo Ersek <lacos@caesar.elte.hu>
-License: GPL-3+
+License: GPL-2+
Files: arg_parser.*
Copyright: 2006-2014 Antonio Diaz Diaz <ant_diaz@teleline.es>
-License: GPL-3+ with Library exception
+License: GPL-2+ with Library exception
Files: debian/*
+License: GPL-2+
Copyright: 2009-2014 Daniel Baumann <mail@daniel-baumann.ch>
-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 <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,
@@ -48,7 +46,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