From 7c87dceb2cff351345f93592090989a2d6bc36a0 Mon Sep 17 00:00:00 2001 From: Andreas Rottmann Date: Wed, 26 Oct 2011 11:23:19 +0200 Subject: Fix lintian warnings about DH compat level and DEP5 issues --- debian/changelog | 10 +++++-- debian/compat | 2 +- debian/copyright | 91 +++++++++++++++++++++++++++++++++++++++++++------------- 3 files changed, 78 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4c856c..90d51bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ libunistring (0.9.3-5) unstable; urgency=low * Standards-Version 3.9.2 (no changes). - * Convert package to multiarch: + * Convert package to multiarch (closes: #646068): - Bumped build-depends versions for cdbs and debhelper. - Extend configure flags to install libraries into multi-arch library directory. @@ -10,9 +10,13 @@ libunistring (0.9.3-5) unstable; urgency=low * Applied outstanding changes from multiarch patch provided by Steve Langasek on bug #646068: - Removed useless .dirs files. - - debian/compat bumped to 9. + - debian/compat bumped to 8 (compat level 9 not needed as we don't use + the "dh" script). + * debian/copyright: + - Bumped DEP5 revision in format URL to 202. + - Fixed various issues pointed out by lintian. - -- Andreas Rottmann Sat, 22 Oct 2011 02:42:09 +0200 + -- Andreas Rottmann Wed, 26 Oct 2011 23:23:59 +0200 libunistring (0.9.3-4) unstable; urgency=low diff --git a/debian/compat b/debian/compat index ec63514..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +8 diff --git a/debian/copyright b/debian/copyright index b7980e5..276411a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 -Name: libunistring -Maintainer: Bruno Haible +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=202 +Upstream-Name: libunistring +Upstream-Contact: Bruno Haible Source: http://ftp.gnu.org/gnu/libunistring/ Files: lib/* @@ -11,11 +11,11 @@ Files: doc/* Copyright: 2001-2009, Free Software Foundation, Inc. License: GPL-3+ or GFDL-1.2+ -Files: test/*, woe32dll/*, autogen.sh +Files: test/* woe32dll/* autogen.sh Copyright: 1990-2009, Free Software Foundation, Inc. License: GPL-3+ -Files: gnulib-m4/*, m4/*.m4, +Files: gnulib-m4/* m4/*.m4 Copyright: 1995-2009, Free Software Foundation, Inc. License: This file is free software; the Free Software Foundation @@ -24,6 +24,7 @@ License: Files: m4/init-package-version.m4 Copyright: 1992-2009, Free Software Foundation, Inc. +License: This file is free software, distributed under the terms of the GNU General Public License. As a special exception to the GNU General Public License, this file may be distributed as part of a program @@ -57,17 +58,17 @@ License: MIT rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + . Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from the X Consor- @@ -77,22 +78,70 @@ Files: debian/* Copyright: 2009, Andreas Rottmann License: GPL-3+ -License: LGPL-3 +License: LGPL-3+ + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . + . On Debian systems the full text of the GNU Lesser General Public - License version 3 can be found in the - `/usr/share/common-licenses/LGPL-3' file. + License version 3 can be found in the file + `/usr/share/common-licenses/LGPL-3'. -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 + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . On Debian systems the full text of the GNU General Public License - version 3 can be found in the `/usr/share/common-licenses/GPL-3' - file. + version 3 can be found in the file + `/usr/share/common-licenses/GPL-3'. -License: GPL-2 +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 2, or (at your option) + any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + . On Debian systems the full text of the GNU General Public License - version 2 can be found in the `/usr/share/common-licenses/GPL-2' - file. - -License: GFDL-1.2 + version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +License: GFDL-1.2+ + This manual is covered by the GNU FDL. Permission is granted to + copy, distribute and/or modify this document under the terms of the + GNU Free Documentation License (FDL), either version 1.2 of the + License, or (at your option) any later version published by the Free + Software Foundation (FSF); with no Invariant Sections, with no + Front-Cover Text, and with no Back-Cover Texts. + . On Debian systems the full text of the GNU Free Documentation License - version 1.2 can be found in the `/usr/share/common-licenses/GFDL-1.2' - file. + version 1.2 can be found in the file + `/usr/share/common-licenses/GFDL-1.2'. -- cgit v1.2.3