[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#710466: Updated and tested patch, now with testsuite test



found 710466 2.5.13
thanks

Hi,

I've updated the patch to also include a check against Depends (which I
thought I had). The patch has been rebased to current Git HEAD, and
additionally features tests for the tag in the testsuite. With the
latest Git HEAD, I've also been able to successfully build lintian with
the patch.

Again, it should be a simple matter of

    git am --signoff 0001-New-check-texi2html-is-obsolete-Closes-710466.patch

to apply and sign-off on the patch.

Best wishes,
Ryan

-- 
|_)|_/	Ryan Kavanagh		| Debian Developer
| \| \	http://ryanak.ca/	| GPG Key 4A11C97A
From 28d7591f18f81a940a80e521474d8c79d7cb94f1 Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <rak@debian.org>
Date: Thu, 30 May 2013 19:38:49 -0400
Subject: [PATCH] New check: texi2html-is-obsolete (Closes: #710466)

Don't [build-]depend on texi2html, but instead use texi2html, as described at
http://lists.debian.org/debian-devel/2013/05/msg01516.html .
---
 checks/fields                                          |   11 +++++++++++
 checks/fields.desc                                     |    9 +++++++++
 t/tests/texi2html-is-obsolete/debian/debian/control.in |   16 ++++++++++++++++
 t/tests/texi2html-is-obsolete/desc                     |    6 ++++++
 t/tests/texi2html-is-obsolete/tags                     |    4 ++++
 5 files changed, 46 insertions(+)
 create mode 100644 t/tests/texi2html-is-obsolete/debian/debian/control.in
 create mode 100644 t/tests/texi2html-is-obsolete/desc
 create mode 100644 t/tests/texi2html-is-obsolete/tags

diff --git a/checks/fields b/checks/fields
index 81f83a2..fee1cf5 100644
--- a/checks/fields
+++ b/checks/fields
@@ -708,6 +708,11 @@ if (($type eq 'binary') || ($type eq 'udeb')) {
                     if ($d_pkg =~ /^python[\d.]*-minimal$/ && &$is_dep_field($field)
                     && $pkg !~ /^python[\d.]*-minimal$/);
 
+                # Transitioning from texi2html to texinfo
+                # http://lists.debian.org/debian-devel/2013/05/msg01516.html
+                tag 'texi2html-is-obsolete', $field,
+                    if ($d_pkg eq 'texi2html');
+
                 tag 'doc-package-depends-on-main-package', $field
                     if ("$d_pkg-doc" eq $pkg && $field =~ /^(?:pre-)?depends$/);
 
@@ -846,6 +851,12 @@ if ($type eq 'source') {
                         tag 'build-depends-on-versioned-berkeley-db', "$field:$d_pkg";
                     }
 
+                    # Transitioning from texi2html to texinfo
+                    # http://lists.debian.org/debian-devel/2013/05/msg01516.html
+                    if ($d_pkg eq 'texi2html') {
+                        tag 'texi2html-is-obsolete', $field
+                    }
+
                     tag 'conflicting-negation-in-source-relation', "$field: $part_d_orig"
                         unless (not $d_arch or $d_arch->[1] == 0 or $d_arch->[1] eq @{ $d_arch->[0] });
 
diff --git a/checks/fields.desc b/checks/fields.desc
index 36f4f91..c6682fe 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -1128,6 +1128,15 @@ Info: The package build-depends on a versioned development package of
  package, please add an override.
 Ref: http://download.oracle.com/docs/cd/E17076_02/html/upgrading/upgrade_process.html
 
+Tag: texi2html-is-obsolete
+Severity: minor
+Certainty: certain
+Info: The package declares a build dependency or a dependency on the obsolete
+ package `texi2html`, which is destined to be removed from the archive. Please
+ transition to using the replacement `makeinfo` utility from the `texinfo`
+ package.
+Ref: http://wiki.debian.org/Texi2htmlTransition
+
 Tag: transitional-package-should-be-oldlibs-extra
 Severity: normal
 Certainty: possible
diff --git a/t/tests/texi2html-is-obsolete/debian/debian/control.in b/t/tests/texi2html-is-obsolete/debian/debian/control.in
new file mode 100644
index 0000000..1429c1a
--- /dev/null
+++ b/t/tests/texi2html-is-obsolete/debian/debian/control.in
@@ -0,0 +1,16 @@
+Source: {$srcpkg}
+Priority: extra
+Section: {$section}
+Maintainer: {$author}
+Standards-Version: {$standards_version}
+Build-Depends: debhelper (>= 9), texi2html
+Build-Depends-Indep: texi2html
+
+Package: {$srcpkg}
+Architecture: {$architecture}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, texi2html
+Description: {$description}
+ This is a test package designed to exercise some feature or tag of
+ Lintian.  It is part of the Lintian test suite and may do very odd
+ things.  It should not be installed like a regular package.  It may
+ be an empty package.
diff --git a/t/tests/texi2html-is-obsolete/desc b/t/tests/texi2html-is-obsolete/desc
new file mode 100644
index 0000000..d34493a
--- /dev/null
+++ b/t/tests/texi2html-is-obsolete/desc
@@ -0,0 +1,6 @@
+Testname: texi2html-is-obsolete
+Sequence: 6000
+Version: 1.0
+Description: Test for a build-dependency/dependency on texi2html
+Test-For: texi2html-is-obsolete
+Author: Ryan Kavanagh <rak@debian.org>
diff --git a/t/tests/texi2html-is-obsolete/tags b/t/tests/texi2html-is-obsolete/tags
new file mode 100644
index 0000000..1bfe466
--- /dev/null
+++ b/t/tests/texi2html-is-obsolete/tags
@@ -0,0 +1,4 @@
+W: texi2html-is-obsolete source: package-has-a-duplicate-build-relation texi2html, texi2html
+W: texi2html-is-obsolete source: texi2html-is-obsolete build-depends
+W: texi2html-is-obsolete source: texi2html-is-obsolete build-depends-indep
+W: texi2html-is-obsolete: texi2html-is-obsolete depends
-- 
1.7.10.4

Attachment: signature.asc
Description: Digital signature


Reply to: