Source: nagios-images Version: 0.8 Severity: normal Tags: patch Dear Maintainer,
The packaging for nagios-images is outdated as reported by lintian. An ancient Standards-Version is used, and an extra-license-file false positive is not addressed. The package also installs symlinks for nagios3 which has been removed from unstable. The attached patches resolve this issue. Kind Regards, Bas
>From b55b14fc2910e73afefcf6b6a835a296479499ca Mon Sep 17 00:00:00 2001 From: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri, 23 Dec 2016 15:07:45 +0100 Subject: Update Vcs-* URLs for move to git. --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 881be09..02b0bbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ nagios-images (0.9) UNRELEASED; urgency=medium * Team upload. * Restructure control file with cme. + * Update Vcs-* URLs for move to git. -- Bas Couwenberg <sebas...@debian.org> Fri, 23 Dec 2016 15:06:34 +0100 diff --git a/debian/control b/debian/control index 2b1a4eb..511961c 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Section: net Priority: optional Build-Depends: debhelper (>= 9) Standards-Version: 3.9.4 -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-nagios/nagios-images/ -Vcs-Svn: svn://anonscm.debian.org/pkg-nagios/nagios-images/trunk/ +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nagios/pkg-nagios-images.git +Vcs-Svn: https://anonscm.debian.org/git/pkg-nagios/pkg-nagios-images.git Package: nagios-images Architecture: all -- 2.1.4
>From cef9fb3b739c506e1a0b043b42016deb46c60cdd Mon Sep 17 00:00:00 2001 From: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri, 23 Dec 2016 15:13:16 +0100 Subject: Update copyright file using copyright-format 1.0. --- debian/changelog | 1 + debian/copyright | 56 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index c94259e..eb3d9df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ nagios-images (0.9) UNRELEASED; urgency=medium * Restructure control file with cme. * Update Vcs-* URLs for move to git. * Enable parallel builds. + * Update copyright file using copyright-format 1.0. -- Bas Couwenberg <sebas...@debian.org> Fri, 23 Dec 2016 15:06:34 +0100 diff --git a/debian/copyright b/debian/copyright index a4f2a2b..4b640ee 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,30 +1,30 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196 -Packaged-By: Debian Nagios Maintainer Group <pkg-nagios-de...@lists.alioth.debian.org> -Packaged-Date: Thu, 6 Oct 2005 19:12:42 +0200 -Upstream-Source: ftp://ftp.debian.org/dists/unstable/main/source/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: Debian Nagios Maintainer Group <pkg-nagios-de...@lists.alioth.debian.org> +Source: https://anonscm.debian.org/cgit/pkg-nagios/pkg-nagios-images.git -Copyright (C) 2005 Debian Nagios Maintainer Group -Copyright Bernhard Albler <balb...@nts.at> -Copyright Cook Garry <gwc...@mactec.com> -Copyright Didier LIROULET <didier.lirou...@tiscali.fr> -Copyright Brad Werschler <bwersch...@sjsd.net> -Copyright Altinity <http://www.altinity.com/nagiosdownloads> +Files: * +Copyright: 2005, Debian Nagios Maintainer Group + Bernhard Albler <balb...@nts.at> + Cook Garry <gwc...@mactec.com> + Didier LIROULET <didier.lirou...@tiscali.fr> + Brad Werschler <bwersch...@sjsd.net> + Altinity <http://www.altinity.com/nagiosdownloads> +License: GPL-2+ -License: - - 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 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 package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +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 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of version 2 of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-2'. -- 2.1.4
>From 01b519e5f679b82b284a7af9b5df687fc8b229bc Mon Sep 17 00:00:00 2001 From: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri, 23 Dec 2016 15:18:29 +0100 Subject: Bump Standards-Version to 3.9.8, changes: copyright-format 1.0. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eb3d9df..6117fd8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ nagios-images (0.9) UNRELEASED; urgency=medium * Update Vcs-* URLs for move to git. * Enable parallel builds. * Update copyright file using copyright-format 1.0. + * Bump Standards-Version to 3.9.8, changes: copyright-format 1.0. -- Bas Couwenberg <sebas...@debian.org> Fri, 23 Dec 2016 15:06:34 +0100 diff --git a/debian/control b/debian/control index 511961c..e97b4c7 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Uploaders: Alexander Wirt <formo...@debian.org>, Section: net Priority: optional Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.4 +Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nagios/pkg-nagios-images.git Vcs-Svn: https://anonscm.debian.org/git/pkg-nagios/pkg-nagios-images.git -- 2.1.4
>From 6c447a8c52f7cd7a5e805fabb16dadf4ea570b0f Mon Sep 17 00:00:00 2001 From: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri, 23 Dec 2016 15:28:58 +0100 Subject: Drop symlinks for nagios3 (no longer in Debian). --- debian/changelog | 1 + debian/links | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7916997..78b1256 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ nagios-images (0.9) UNRELEASED; urgency=medium * Update copyright file using copyright-format 1.0. * Bump Standards-Version to 3.9.8, changes: copyright-format 1.0. * Add lintian override for extra-license-file false positive. + * Drop symlinks for nagios3 (no longer in Debian). -- Bas Couwenberg <sebas...@debian.org> Fri, 23 Dec 2016 15:06:34 +0100 diff --git a/debian/links b/debian/links index 15b3f0a..aa65401 100644 --- a/debian/links +++ b/debian/links @@ -1,14 +1,3 @@ -#nagios3 -usr/share/nagios/htdocs/images/logos/andrade usr/share/nagios3/htdocs/images/logos/andrade -usr/share/nagios/htdocs/images/logos/base usr/share/nagios3/htdocs/images/logos/base -usr/share/nagios/htdocs/images/logos/bernhard usr/share/nagios3/htdocs/images/logos/bernhard -usr/share/nagios/htdocs/images/logos/cook usr/share/nagios3/htdocs/images/logos/cook -usr/share/nagios/htdocs/images/logos/didier usr/share/nagios3/htdocs/images/logos/didier -usr/share/nagios/htdocs/images/logos/remus usr/share/nagios3/htdocs/images/logos/remus -usr/share/nagios/htdocs/images/logos/satrapa usr/share/nagios3/htdocs/images/logos/satrapa -usr/share/nagios/htdocs/images/logos/werschler usr/share/nagios3/htdocs/images/logos/werschler -usr/share/nagios/htdocs/images/logos/symbols usr/share/nagios3/htdocs/images/logos/symbols -usr/share/nagios/htdocs/images/logos/logos usr/share/nagios3/htdocs/images/logos/logos #icinga usr/share/nagios/htdocs/images/logos/andrade usr/share/icinga/htdocs/images/logos/andrade usr/share/nagios/htdocs/images/logos/base usr/share/icinga/htdocs/images/logos/base -- 2.1.4
>From c6d25dc3791f189c6aed4225e8e5e1827ce0a0d9 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri, 23 Dec 2016 15:08:13 +0100 Subject: Enable parallel builds. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 02b0bbb..c94259e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ nagios-images (0.9) UNRELEASED; urgency=medium * Team upload. * Restructure control file with cme. * Update Vcs-* URLs for move to git. + * Enable parallel builds. -- Bas Couwenberg <sebas...@debian.org> Fri, 23 Dec 2016 15:06:34 +0100 diff --git a/debian/rules b/debian/rules index b8796e6..95e5041 100755 --- a/debian/rules +++ b/debian/rules @@ -2,4 +2,4 @@ # -*- makefile -*- %: - dh $@ + dh $@ --parallel -- 2.1.4
>From 98bc1d3ea62746166fcac557727f6c8fa3b0f245 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri, 23 Dec 2016 15:24:02 +0100 Subject: Add lintian override for extra-license-file false positive. --- debian/changelog | 1 + debian/lintian-overrides | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 debian/lintian-overrides diff --git a/debian/changelog b/debian/changelog index 6117fd8..7916997 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ nagios-images (0.9) UNRELEASED; urgency=medium * Enable parallel builds. * Update copyright file using copyright-format 1.0. * Bump Standards-Version to 3.9.8, changes: copyright-format 1.0. + * Add lintian override for extra-license-file false positive. -- Bas Couwenberg <sebas...@debian.org> Fri, 23 Dec 2016 15:06:34 +0100 diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 0000000..c1b4d17 --- /dev/null +++ b/debian/lintian-overrides @@ -0,0 +1,3 @@ +# False positive, file is an image not a license file. +nagios-images: extra-license-file usr/share/nagios/htdocs/images/logos/logos/bsd.gd2 + -- 2.1.4
>From 0c396a30756d873f2f297e3391830b2311a98674 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri, 23 Dec 2016 15:17:22 +0100 Subject: Align paths in links file. --- debian/links | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/links b/debian/links index daae3ff..15b3f0a 100644 --- a/debian/links +++ b/debian/links @@ -7,8 +7,8 @@ usr/share/nagios/htdocs/images/logos/didier usr/share/nagios3/htdocs/images/ usr/share/nagios/htdocs/images/logos/remus usr/share/nagios3/htdocs/images/logos/remus usr/share/nagios/htdocs/images/logos/satrapa usr/share/nagios3/htdocs/images/logos/satrapa usr/share/nagios/htdocs/images/logos/werschler usr/share/nagios3/htdocs/images/logos/werschler -usr/share/nagios/htdocs/images/logos/symbols usr/share/nagios3/htdocs/images/logos/symbols -usr/share/nagios/htdocs/images/logos/logos usr/share/nagios3/htdocs/images/logos/logos +usr/share/nagios/htdocs/images/logos/symbols usr/share/nagios3/htdocs/images/logos/symbols +usr/share/nagios/htdocs/images/logos/logos usr/share/nagios3/htdocs/images/logos/logos #icinga usr/share/nagios/htdocs/images/logos/andrade usr/share/icinga/htdocs/images/logos/andrade usr/share/nagios/htdocs/images/logos/base usr/share/icinga/htdocs/images/logos/base @@ -18,8 +18,8 @@ usr/share/nagios/htdocs/images/logos/didier usr/share/icinga/htdocs/images/l usr/share/nagios/htdocs/images/logos/remus usr/share/icinga/htdocs/images/logos/remus usr/share/nagios/htdocs/images/logos/satrapa usr/share/icinga/htdocs/images/logos/satrapa usr/share/nagios/htdocs/images/logos/werschler usr/share/icinga/htdocs/images/logos/werschler -usr/share/nagios/htdocs/images/logos/symbols usr/share/icinga/htdocs/images/logos/symbols -usr/share/nagios/htdocs/images/logos/logos usr/share/icinga/htdocs/images/logos/logos +usr/share/nagios/htdocs/images/logos/symbols usr/share/icinga/htdocs/images/logos/symbols +usr/share/nagios/htdocs/images/logos/logos usr/share/icinga/htdocs/images/logos/logos #icinga-web usr/share/nagios/htdocs/images/logos/andrade usr/share/icinga-web/pub/images/icinga/andrade usr/share/nagios/htdocs/images/logos/base usr/share/icinga-web/pub/images/icinga/base @@ -29,5 +29,5 @@ usr/share/nagios/htdocs/images/logos/didier usr/share/icinga-web/pub/images/ usr/share/nagios/htdocs/images/logos/remus usr/share/icinga-web/pub/images/icinga/remus usr/share/nagios/htdocs/images/logos/satrapa usr/share/icinga-web/pub/images/icinga/satrapa usr/share/nagios/htdocs/images/logos/werschler usr/share/icinga-web/pub/images/icinga/werschler -usr/share/nagios/htdocs/images/logos/symbols usr/share/icinga-web/pub/images/icinga/symbols -usr/share/nagios/htdocs/images/logos/logos usr/share/icinga-web/pub/images/icinga/logos +usr/share/nagios/htdocs/images/logos/symbols usr/share/icinga-web/pub/images/icinga/symbols +usr/share/nagios/htdocs/images/logos/logos usr/share/icinga-web/pub/images/icinga/logos -- 2.1.4
>From 9a69e0e00885e3aa3e2cb4bf0528572dc28cf0c9 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri, 23 Dec 2016 15:06:50 +0100 Subject: Restructure control file with cme. --- debian/changelog | 7 +++++++ debian/control | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3338405..881be09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nagios-images (0.9) UNRELEASED; urgency=medium + + * Team upload. + * Restructure control file with cme. + + -- Bas Couwenberg <sebas...@debian.org> Fri, 23 Dec 2016 15:06:34 +0100 + nagios-images (0.8) unstable; urgency=low * [d9ee334] Add script to rebuild .gd2 images from png diff --git a/debian/control b/debian/control index 2f895c4..2b1a4eb 100644 --- a/debian/control +++ b/debian/control @@ -1,12 +1,13 @@ Source: nagios-images +Maintainer: Debian Nagios Maintainer Group <pkg-nagios-de...@lists.alioth.debian.org> +Uploaders: Alexander Wirt <formo...@debian.org>, + Jan Wagner <w...@cyconet.org> Section: net Priority: optional -Maintainer: Debian Nagios Maintainer Group <pkg-nagios-de...@lists.alioth.debian.org> -Uploaders: Alexander Wirt <formo...@debian.org>, Jan Wagner <w...@cyconet.org> Build-Depends: debhelper (>= 9) -Vcs-Browser: http://svn.debian.org/wsvn/pkg-nagios/nagios-images/ -Vcs-Svn: svn://svn.debian.org/pkg-nagios/nagios-images/trunk/ Standards-Version: 3.9.4 +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-nagios/nagios-images/ +Vcs-Svn: svn://anonscm.debian.org/pkg-nagios/nagios-images/trunk/ Package: nagios-images Architecture: all -- 2.1.4