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

[lintian] 02/02: Also check for obsolete emacs package names with common suffixes



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

abe pushed a commit to branch master
in repository lintian.

commit 00b4565604a3c7a3d65da14a3dd1ed89c2f98356
Author: Axel Beckert <abe@deuxchevaux.org>
Date:   Thu Aug 13 17:08:23 2015 +0200

    Also check for obsolete emacs package names with common suffixes
    
    (-gtk, -el, -nox, lucid)
    
    Signed-off-by: Axel Beckert <abe@deuxchevaux.org>
---
 checks/fields.pm                                        | 4 +++-
 debian/changelog                                        | 2 ++
 t/tests/fields-depends-general/debian/debian/control.in | 2 +-
 t/tests/fields-depends-general/tags                     | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/checks/fields.pm b/checks/fields.pm
index d8a2cb4..bceb3ef 100644
--- a/checks/fields.pm
+++ b/checks/fields.pm
@@ -55,7 +55,9 @@ my $KNOWN_PRIOS = Lintian::Data->new('common/priorities', qr/\s*=\s*/o);
 our @supported_source_formats = (qr/1\.0/, qr/3\.0\s*\((quilt|native)\)/);
 
 # Still in the archive but shouldn't be the primary Emacs dependency.
-our %known_obsolete_emacs = map { $_ => 1 } ('emacs21', 'emacs22', 'emacs23');
+our %known_obsolete_emacs = map { $_ => 1 }
+  map { $_, $_.'-el', $_.'-gtk', $_.'-nox', $_.'-lucid' }
+  qw(emacs21 emacs22 emacs23);
 
 our %known_libstdcs = map { $_ => 1 } (
     'libstdc++2.9-glibc2.1', 'libstdc++2.10',
diff --git a/debian/changelog b/debian/changelog
index e870437..a63eb42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ lintian (2.5.36) UNRELEASED; urgency=medium
       smbc package.
   * checks/fields.pm:
     + [AB] Add emacs23 to list of obsolete Emacs package names.
+    + [AB] Also check for obsolete emacs package names with common
+      suffixes (-gtk, -el, -nox, lucid)
   * checks/files.desc:
     + [BR] Correct a few typos.  (Closes: #794953)
     + [BR] Rename files-privacybreach-may-use-debian-package
diff --git a/t/tests/fields-depends-general/debian/debian/control.in b/t/tests/fields-depends-general/debian/debian/control.in
index 7039114..c9a9051 100644
--- a/t/tests/fields-depends-general/debian/debian/control.in
+++ b/t/tests/fields-depends-general/debian/debian/control.in
@@ -10,7 +10,7 @@ Architecture: {$architecture}
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, xorg, bash,
  conflict-dep, gawk | awk, new-package | xbase-clients (>= 0.1), {$source},
  gaim (>= 0.1), emacs21, emacs22, emacs23, makedev, libtest-simple-perl (>= 0.98),
- packaging-dev, xfont-a
+ packaging-dev, xfont-a, emacs22-gtk, emacs23-el, emacs23-nox, emacs23-lucid
 Breaks: package-without-version, {$source} (<< 0.1),
  replaced-wo-version
 Replaces: replaced-wo-version
diff --git a/t/tests/fields-depends-general/tags b/t/tests/fields-depends-general/tags
index 5758d22..2f2c0d8 100644
--- a/t/tests/fields-depends-general/tags
+++ b/t/tests/fields-depends-general/tags
@@ -15,7 +15,11 @@ W: fields-depends-general: breaks-without-version package-without-version
 W: fields-depends-general: depends-exclusively-on-makedev depends
 W: fields-depends-general: depends-on-old-emacs depends: emacs21
 W: fields-depends-general: depends-on-old-emacs depends: emacs22
+W: fields-depends-general: depends-on-old-emacs depends: emacs22-gtk
 W: fields-depends-general: depends-on-old-emacs depends: emacs23
+W: fields-depends-general: depends-on-old-emacs depends: emacs23-el
+W: fields-depends-general: depends-on-old-emacs depends: emacs23-lucid
+W: fields-depends-general: depends-on-old-emacs depends: emacs23-nox
 W: fields-depends-general: depends-on-packaging-dev depends
 W: fields-depends-general: package-relation-with-self breaks: fields-depends-general (<< 0.1)
 W: fields-depends-general: versioned-dependency-satisfied-by-perl depends: libtest-simple-perl (>= 0.98)

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


Reply to: