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

[lintian] 07/15: install-sgmlcatalog-deprecated -> maintainer-script-should-not-use-install-sgmlcatalog



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

broucaries-guest pushed a commit to branch master
in repository lintian.

commit cab86c66b405666a1ceb2324983ad26c28c086c7
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date:   Sat Dec 14 14:27:26 2013 +0100

    install-sgmlcatalog-deprecated -> maintainer-script-should-not-use-install-sgmlcatalog
    
    Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
 checks/scripts.desc                        | 2 +-
 data/scripts/maintainer-script-bad-command | 3 ++-
 debian/changelog                           | 3 ++-
 t/tests/scripts-maintainer-general/desc    | 2 +-
 t/tests/scripts-maintainer-general/tags    | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/checks/scripts.desc b/checks/scripts.desc
index 9f8b34a..358b275 100644
--- a/checks/scripts.desc
+++ b/checks/scripts.desc
@@ -584,7 +584,7 @@ Info: This package appears to modify <tt>/etc/ld.so.conf</tt> and does not
  packages may cause random segfaults and difficult-to-debug problems
  instead of conflicts in the package manager.
 
-Tag: install-sgmlcatalog-deprecated
+Tag: maintainer-script-should-not-use-install-sgmlcatalog
 Severity: important
 Certainty: certain
 Info: The maintainer script apparently runs install-sgmlcatalog.
diff --git a/data/scripts/maintainer-script-bad-command b/data/scripts/maintainer-script-bad-command
index 5121dad..2d409a1 100644
--- a/data/scripts/maintainer-script-bad-command
+++ b/data/scripts/maintainer-script-bad-command
@@ -19,8 +19,8 @@
 #
 # Please alpha sort by tag
 #
+# ftpmaster auto reject so do not rename
 install-info-used-in-maintainer-script                          ~~ 1 ~~                    ~~          ~~\binstall-info\b
-install-sgmlcatalog-deprecated                                  ~~ 1 ~~                    ~~          ~~\binstall-sgmlcatalog\b
 maintainer-script-hides-init-failure                            ~~ 0 ~~                    ~~          ~~invoke-rc.d.*\|\| \s+ exit \s+ 0
 maintainer-script-modifies-ld-so-conf                           ~~ 0 ~~^libc               ~~          ~~(?:\A\s*(?:cp|mv)\s+.*\s+|>\s*)/etc/ld\.so\.conf\s*(?:\s|\Z)
 maintainer-script-modifies-netbase-managed-file                 ~~ 0 ~~                    ~~          ~~(?:\A\s*(?:cp|mv)\s+.*\s+|>\s*)(/etc/(?:services|protocols|rpc))\s*(?:\s|\Z)
@@ -32,6 +32,7 @@ maintainer-script-should-not-use-ancient-dpkg-multi-conrep-check~~ 0 ~~
 maintainer-script-should-not-use-deprecated-chown-usage         ~~ 0 ~~                    ~~          ~~(chown(?:\s+--?[A-Za-z-]+)*\s+[-_A-Za-z0-9]+\.[-_A-Za-z0-9]+)\s+
 maintainer-script-should-not-use-fc-cache                       ~~ 0 ~~^(fontconfig)$      ~~          ~~${LEADIN}(?:/usr/bin/)?fc-cache(?:\s|\Z)
 maintainer-script-should-not-use-gconftool                      ~~ 1 ~~^(gconf\d)$         ~~          ~~(?:/usr/bin/)?gconftool(?:-\d)?(?:\s|\Z)
+maintainer-script-should-not-use-install-sgmlcatalog            ~~ 1 ~~                    ~~          ~~\binstall-sgmlcatalog\b
 update-alternatives-remove-called-in-postrm                     ~~ 1 ~~                    ~~^postrm$  ~~\b update\-alternatives\s+\-\-remove\b
 update-alternatives-set-called-in-maintainer-script             ~~ 1 ~~                    ~~          ~~\b update\-alternatives\s+\-\-(?:set|set\-selections|config)\b
 start-stop-daemon-in-maintainer-script                          ~~ 0 ~~                    ~~          ~~\s*start-stop-daemon(?=\s)(?!.*\s--stop\b)
diff --git a/debian/changelog b/debian/changelog
index 8180976..435d71b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,7 +37,8 @@ lintian (2.5.20) UNRELEASED; urgency=low
     + [BR] Detect use of adduser --system without --home or with
       --home inside /home.  (Closes: #730456).
     + [BR] install-sgmlcatalog is deprecated for a long time.  Warn
-      now in all use case.
+      now in all use case.  Rename the tag to
+      maintainer-script-should-not-use-install-sgmlcatalog
     + [BR] Rename gconftool-used-in-maintainer-script to
       maintainer-script-should-not-use-gconftool.  Add gconf\d package
       to exception list.
diff --git a/t/tests/scripts-maintainer-general/desc b/t/tests/scripts-maintainer-general/desc
index 7b9705c..a14e890 100644
--- a/t/tests/scripts-maintainer-general/desc
+++ b/t/tests/scripts-maintainer-general/desc
@@ -8,7 +8,6 @@ Description: Check general problems in maintainer scripts
 Test-For:
  command-with-path-in-maintainer-script
  install-info-used-in-maintainer-script
- install-sgmlcatalog-deprecated
  maintainer-script-has-unexpanded-debhelper-token
  maintainer-script-hides-init-failure
  maintainer-script-ignores-errors
@@ -26,6 +25,7 @@ Test-For:
  maintainer-script-should-not-use-deprecated-chown-usage
  maintainer-script-should-not-use-fc-cache
  maintainer-script-should-not-use-gconftool
+ maintainer-script-should-not-use-install-sgmlcatalog
  mknod-in-maintainer-script
  possibly-insecure-handling-of-tmp-files-in-maintainer-script
  read-in-maintainer-script
diff --git a/t/tests/scripts-maintainer-general/tags b/t/tests/scripts-maintainer-general/tags
index 55c9fe3..c4b8e27 100644
--- a/t/tests/scripts-maintainer-general/tags
+++ b/t/tests/scripts-maintainer-general/tags
@@ -1,5 +1,3 @@
-E: scripts-maintainer-general: install-sgmlcatalog-deprecated postinst:74
-E: scripts-maintainer-general: install-sgmlcatalog-deprecated postinst:75
 E: scripts-maintainer-general: maintainer-script-modifies-inetd-conf postinst:67
 E: scripts-maintainer-general: maintainer-script-modifies-inetd-conf postinst:68
 E: scripts-maintainer-general: maintainer-script-modifies-ld-so-conf postinst:108
@@ -10,6 +8,8 @@ E: scripts-maintainer-general: maintainer-script-modifies-netbase-managed-file p
 E: scripts-maintainer-general: maintainer-script-removes-device-files postinst:141 '/dev/null'
 E: scripts-maintainer-general: maintainer-script-should-not-use-adduser-system-without-home postinst:148
 E: scripts-maintainer-general: maintainer-script-should-not-use-adduser-system-without-home postinst:149
+E: scripts-maintainer-general: maintainer-script-should-not-use-install-sgmlcatalog postinst:74
+E: scripts-maintainer-general: maintainer-script-should-not-use-install-sgmlcatalog postinst:75
 E: scripts-maintainer-general: maintainer-script-uses-dpkg-status-directly postinst:56
 E: scripts-maintainer-general: maintainer-shell-script-fails-syntax-check prerm
 E: scripts-maintainer-general: mknod-in-maintainer-script postinst:125

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


Reply to: