Run of lintian-fixes for clamtk
Merge these changes:
git pull https://janitor.debian.net/git/clamtk lintian-fixes/main
Summary
- Trim trailing whitespace. ( trailing-whitespace )
- Use correct machine-readable copyright file URI. ( out-of-date-copyright-format-uri )
- Fix field name typo in debian/copyright (X-Comment ⇒ Comment). ( field-name-typo-in-dep5-copyright )
- Update standards version to 4.6.2, no changes needed. ( out-of-date-standards-version )
Diff
diff --git a/debian/changelog b/debian/changelog
index ec84dec..75a90b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+clamtk (6.07-1.2) UNRELEASED; urgency=medium
+
+ * Trim trailing whitespace.
+ * Use correct machine-readable copyright file URI.
+ * Fix field name typo in debian/copyright (X-Comment ⇒ Comment).
+ * Update standards version to 4.6.2, no changes needed.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sun, 08 Jan 2023 21:28:12 -0000
+
clamtk (6.07-1.1) unstable; urgency=medium
* Non-maintainer upload
@@ -742,12 +751,12 @@ clamtk (2.31-0ubuntu1) feisty; urgency=low
- 2.30:
- This release fixes issues when using ClamAV 0.90. (LP: #90790)
- 2.29:
- - Will now use {daily,main}.cvd.rpmnew if {daily,main}.cvd files are
- not found. This should only impact rpm-based distros, and even then
+ - Will now use {daily,main}.cvd.rpmnew if {daily,main}.cvd files are
+ not found. This should only impact rpm-based distros, and even then
should only last until the user runs freshclam to update.
- 2.28:
- Added Czech (cs_CZ) language support.
- - Minor change to allow for mostly 0.90 rc support - probably not
+ - Minor change to allow for mostly 0.90 rc support - probably not
totally ready yet.
-- Daniel Holbach <daniel.holbach@ubuntu.com> Mon, 26 Mar 2007 10:00:48 +0200
@@ -784,7 +793,7 @@ clamtk (2.24-0ubuntu1) edgy; urgency=low
- Added additional language support - Spanish (es_ES), Polish (pl_PL).
- Updated most translation files - fixes the change from 2.22
("Select Files").
- - Extended the signature update timeout time. This is because there have
+ - Extended the signature update timeout time. This is because there have
been more frequent - and therefore larger - updates. This was
occasionally misinterpreted as not having been able to update.
* debian/patches/remove-first_run-from-clamtk.patch:
@@ -978,8 +987,8 @@ clamtk (2.08-0ubuntu1) dapper; urgency=low
* New upstream release:
- Fixed justification problem with $top_label (set_justify). (?)
- - Fixed quarantine/delete bug where, when a file in an archive is
- detected as a virus, it continues to try to quarantine/delete the
+ - Fixed quarantine/delete bug where, when a file in an archive is
+ detected as a virus, it continues to try to quarantine/delete the
archive.
- Removed cabextract functionality.
- Removed "size" display. Size only comes into play when greater than
diff --git a/debian/control b/debian/control
index b928202..a78d0f2 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
Build-Depends-Indep:
liblocale-gettext-perl
, gettext
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
Homepage: https://gitlab.com/dave_m/clamtk
Vcs-Git: https://salsa.debian.org/clamav-team/clamtk.git
Vcs-Browser: https://salsa.debian.org/clamav-team/clamtk
@@ -67,4 +67,3 @@ Description: GNOME (Nautilus) MenuProvider extension for ClamTk
.
This package contains a nautilus plugin to allow right click support for easy
virus scanning with ClamTk and thus ClamAV in GNOME.
-
diff --git a/debian/copyright b/debian/copyright
index c56e97a..a065479 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright: (C) 2004-2021 Dave M
@@ -26,7 +26,7 @@ License: GPL-3+
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-X-Comment: on Debian systems, the complete text of the GNU General Public
+Comment: on Debian systems, the complete text of the GNU General Public
License v3 can be found in `/usr/share/common-licenses/GPL-3'.
License: GPL-1+
@@ -43,12 +43,12 @@ License: GPL-1+
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 St, Fifth Floor, Boston, MA 02110-1301, USA.
-X-Comment: on Debian systems, the complete text of the GNU General Public
+Comment: on Debian systems, the complete text of the GNU General Public
License v1 can be found in `/usr/share/common-licenses/GPL-1'.
License: Artistic
THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-X-Comment: on Debian systems, the complete text of the license can be
+Comment: on Debian systems, the complete text of the license can be
found in `/usr/share/common-licenses/Artistic'.
Debdiff
File lists identical (after any substitutions)
No differences were encountered between the control files of package clamtk
No differences were encountered between the control files of package clamtk-gnome
Publish History
- 2023-01-11T02:40: Merge proposal updated ( Success )
Resulting package
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t lintian-fixes clamtk-gnomeapt install -t lintian-fixes clamtk
Lintian Result
- clamtk-gnome_6.07-1.2~jan+lint1_all.deb
- clamtk_6.07-1.2~jan+lint1.dsc
- clamtk_6.07-1.2~jan+lint1_all.deb
- clamtk_6.07-1.2~jan+lint1_amd64.buildinfo
- clamtk_6.07-1.2~jan+lint1_amd64.changes
Reviews
Reviewer | Verdict | Comment |
---|---|---|
jelmer@debian.org | approved |