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

[lintian] 02/02: Stop recommending that packages with repacked tarballs specify a get-orig-source target; this was removed in Debian Policy 4.1.4 in favour of uscan(1) and debian/watch.



This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository lintian.

commit c20e79a879cfbe1ce0e0d70f7ac6a56e0508e3b9
Author: Chris Lamb <lamby@debian.org>
Date:   Fri Apr 6 10:00:06 2018 +0100

    Stop recommending that packages with repacked tarballs specify a get-orig-source target; this was removed in Debian Policy 4.1.4 in favour of uscan(1) and debian/watch.
---
 checks/rules.desc                      | 10 ----------
 checks/rules.pm                        |  4 ----
 data/rules/policy-rules                |  3 ---
 debian/changelog                       |  4 ++++
 t/tests/legacy-maintainer-scripts/desc |  1 -
 t/tests/legacy-maintainer-scripts/tags |  1 -
 t/tests/legacy-scripts/desc            |  1 -
 t/tests/legacy-scripts/tags            |  1 -
 t/tests/rules-missing-targets/desc     |  1 -
 t/tests/rules-missing-targets/tags     |  1 -
 10 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/checks/rules.desc b/checks/rules.desc
index 747c613..f12f6e6 100644
--- a/checks/rules.desc
+++ b/checks/rules.desc
@@ -60,16 +60,6 @@ Info: The <tt>debian/rules</tt> file for this package does not provide
  These targets will be required by policy in the future, so should be
  added to prevent future breakage.
 
-Tag: debian-rules-missing-good-practice-target-dfsg
-Severity: wishlist
-Certainty: certain
-Ref: policy 4.9, devref 6.7.8.2
-Info: The <tt>debian/rules</tt> file for this package does not provide
- one of the good practice targets.
- .
- If your packaged is repacked from non-dfsg source, you should add a
- get-orig-source target.
-
 Tag: debian-rules-uses-deprecated-makefile
 Severity: normal
 Certainty: certain
diff --git a/checks/rules.pm b/checks/rules.pm
index 20ae09f..9403e4a 100644
--- a/checks/rules.pm
+++ b/checks/rules.pm
@@ -409,10 +409,6 @@ sub run {
                     tag 'debian-rules-missing-required-target', $target;
                 } elsif ($typerule eq 'recommended_allindep') {
                     tag 'debian-rules-missing-recommended-target', $target;
-                } elsif ($typerule eq 'goodpractice_dfsg') {
-                    tag 'debian-rules-missing-good-practice-target-dfsg',
-                      $target
-                      if $info->repacked;
                 } else {
                     $typerule ||= '<N/A>';
                     croak(
diff --git a/data/rules/policy-rules b/data/rules/policy-rules
index a86de92..f698949 100644
--- a/data/rules/policy-rules
+++ b/data/rules/policy-rules
@@ -5,8 +5,6 @@
 # - "required"  => For required rules (prior to 3.9.4)
 # - recommended_allindep => For the new required targets in 3.9.4
 #    (these used to just be recommended)
-# - goodpractice_dfsg => Target recommended for repacked packages
-#    (e.g. packages with non-free files removed)
 build             required
 binary            required
 binary-arch       required
@@ -14,4 +12,3 @@ binary-indep      required
 clean             required
 build-arch        recommended_allindep
 build-indep       recommended_allindep
-get-orig-source   goodpractice_dfsg
diff --git a/debian/changelog b/debian/changelog
index 9f2909f..2d0b314 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,10 @@ lintian (2.5.81) UNRELEASED; urgency=medium
     + [CL] Avoid false-positives in Mallard XML files; <link href="...">
       tags are anchor element and not followed automatically. Thanks to
       Simon McVittie for the report.  (Closes: #894690)
+  * checks/rules.{desc,pm}:
+    + [CL] Stop recommending that packages with repacked tarballs specify a
+      get-orig-source target; this was removed in Debian Policy 4.1.4 in
+      favour of uscan(1) and debian/watch.
   * checks/testsuite.{desc,pm}:
     + [CL] Apply patch from Georg Faerber to add missing "needs-reboot" to
       the list of known autopkgtest restrictions.  (Closes: #894817)
diff --git a/t/tests/legacy-maintainer-scripts/desc b/t/tests/legacy-maintainer-scripts/desc
index 6cb932c..9b9706e 100644
--- a/t/tests/legacy-maintainer-scripts/desc
+++ b/t/tests/legacy-maintainer-scripts/desc
@@ -10,7 +10,6 @@ Test-For:
  config-does-not-load-confmodule
  debhelper-but-no-misc-depends
  debian-changelog-file-contains-invalid-email-address
- debian-rules-missing-good-practice-target-dfsg
  debian-watch-file-in-native-package
  debian-watch-file-should-mangle-version
  debian-watch-file-unknown-version
diff --git a/t/tests/legacy-maintainer-scripts/tags b/t/tests/legacy-maintainer-scripts/tags
index 6dc884f..fa9f06a 100644
--- a/t/tests/legacy-maintainer-scripts/tags
+++ b/t/tests/legacy-maintainer-scripts/tags
@@ -36,7 +36,6 @@ E: maintainer-scripts: read-in-maintainer-script prerm:64
 E: maintainer-scripts: read-in-maintainer-script prerm:65
 E: maintainer-scripts: read-in-maintainer-script prerm:66
 E: maintainer-scripts: wrong-debian-qa-group-name QA group <packages@qa.debian.org>
-I: maintainer-scripts source: debian-rules-missing-good-practice-target-dfsg get-orig-source
 I: maintainer-scripts source: debian-watch-uses-insecure-uri http://domain.tld/foo-(.+)\.tar\.gz
 I: maintainer-scripts: no-md5sums-control-file
 I: maintainer-scripts: output-of-updaterc.d-not-redirected-to-dev-null bar postrm
diff --git a/t/tests/legacy-scripts/desc b/t/tests/legacy-scripts/desc
index e91ece1..c37f7b6 100644
--- a/t/tests/legacy-scripts/desc
+++ b/t/tests/legacy-scripts/desc
@@ -14,7 +14,6 @@ Test-For:
  copyright-file-lacks-pointer-to-perl-license
  debhelper-but-no-misc-depends
  debhelper-compat-file-is-missing
- debian-rules-missing-good-practice-target-dfsg
  debian-watch-file-declares-multiple-versions
  debian-watch-file-should-dversionmangle-not-uversionmangle
  debian-watch-file-should-use-sf-redirector
diff --git a/t/tests/legacy-scripts/tags b/t/tests/legacy-scripts/tags
index d0b21e9..ff6dbc8 100644
--- a/t/tests/legacy-scripts/tags
+++ b/t/tests/legacy-scripts/tags
@@ -25,7 +25,6 @@ E: scripts: script-without-interpreter control/prerm
 E: scripts: shell-script-fails-syntax-check usr/bin/sh-broken
 E: scripts: wrong-path-for-interpreter usr/bin/lefty-foo (#!/usr/local/bin/lefty != /usr/bin/lefty)
 E: scripts: wrong-path-for-interpreter usr/bin/rubyfoo (#!/bin/ruby1.8 != /usr/bin/ruby1.8)
-I: scripts source: debian-rules-missing-good-practice-target-dfsg get-orig-source
 I: scripts source: debian-watch-file-should-dversionmangle-not-uversionmangle line 5
 I: scripts source: dpatch-missing-description 02_i_dont_have_a_description.patch
 I: scripts source: dpatch-missing-description 04_i_dont_have_a_description_either.patch
diff --git a/t/tests/rules-missing-targets/desc b/t/tests/rules-missing-targets/desc
index 9843391..04ff18b 100644
--- a/t/tests/rules-missing-targets/desc
+++ b/t/tests/rules-missing-targets/desc
@@ -3,5 +3,4 @@ Version: 1.0+dfsg-1
 Type: non-native
 Description: Test for missing targets in debian/rules
 Test-For:
- debian-rules-missing-good-practice-target-dfsg
  debian-rules-missing-recommended-target
diff --git a/t/tests/rules-missing-targets/tags b/t/tests/rules-missing-targets/tags
index eeb2cb1..38367e1 100644
--- a/t/tests/rules-missing-targets/tags
+++ b/t/tests/rules-missing-targets/tags
@@ -1,3 +1,2 @@
-I: rules-missing-targets source: debian-rules-missing-good-practice-target-dfsg get-orig-source
 W: rules-missing-targets source: debian-rules-missing-recommended-target build-arch
 W: rules-missing-targets source: debian-rules-missing-recommended-target build-indep

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: