diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-06 12:51:26 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-06 12:51:26 +0000 |
| commit | 1d59db388b18716d30c744d93e391628b5c1b2db (patch) | |
| tree | b7b476e1de4937ab33da9fed5ab7b5e067a0a2fe | |
| parent | Merging upstream version 1.6. (diff) | |
| download | clzip-1d59db388b18716d30c744d93e391628b5c1b2db.tar.xz clzip-1d59db388b18716d30c744d93e391628b5c1b2db.zip | |
Adding debian version 1.6-1.debian/1.6-1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/copyright | 18 | ||||
| -rw-r--r-- | debian/patches/0001-build.patch | 4 |
3 files changed, 19 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 478513e..6c1a181 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +clzip (1.6-1) unstable; urgency=low + + * Merging upstream version 1.6. + * Updating copyright file. + * Removing date headers in build.patch. + + -- Daniel Baumann <mail@daniel-baumann.ch> Sat, 06 Sep 2014 23:19:32 +0200 + clzip (1.6~rc1-1) unstable; urgency=low * Merging upstream version 1.6~rc1. diff --git a/debian/copyright b/debian/copyright index e7ef6cf..634a73d 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: 2009-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 diff --git a/debian/patches/0001-build.patch b/debian/patches/0001-build.patch index ee24c86..6eff446 100644 --- a/debian/patches/0001-build.patch +++ b/debian/patches/0001-build.patch @@ -2,8 +2,8 @@ Author: Daniel Baumann <mail@daniel-baumann.ch> Description: Avoid overwriting build-environment. diff -Naurp clzip.orig/configure clzip/configure ---- clzip.orig/configure 2013-07-19 17:24:58.332735484 +0200 -+++ clzip/configure 2013-07-19 17:30:30.803563946 +0200 +--- clzip.orig/configure ++++ clzip/configure @@ -20,10 +20,10 @@ bindir='$(exec_prefix)/bin' datarootdir='$(prefix)/share' infodir='$(datarootdir)/info' |