Update Lintian overrides

diff --git a/debian/changelog b/debian/changelog
index 004b2ab6f4295528ea02d449ff2ea9cd1938595b..d3dd7dc46c1c821c3907308dff56c5c8e3dc3d88 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ emacs (1:26.1+1-3.1) UNRELEASED; urgency=medium
 
   * Use https:// URLs and update FSF address.
 
+  * Update Lintian overrides.
+
  -- Andreas Beckmann <anbe@debian.org>  Sun, 27 Jan 2019 16:56:15 +0100
 
 emacs (1:26.1+1-3) unstable; urgency=medium

diff --git a/debian/emacs-bin-common.lintian-overrides b/debian/emacs-bin-common.lintian-overrides
index fc6ca28590747ca4c9575c0ae57f19c83ee56bd7..28a8ea62aead1a8455527d855350e65d86454d92 100644 (file)
--- a/debian/emacs-bin-common.lintian-overrides
+++ b/debian/emacs-bin-common.lintian-overrides
@@ -1,7 +1,4 @@
-emacs-bin-common binary: binary-without-manpage usr/bin/b2m.emacs
-emacs-bin-common binary: binary-without-manpage usr/bin/ctags.emacs
-emacs-bin-common binary: binary-without-manpage usr/bin/ebrowse.emacs
-emacs-bin-common binary: binary-without-manpage usr/bin/emacsclient.emacs
-emacs-bin-common binary: binary-without-manpage usr/bin/etags.emacs
-emacs-bin-common binary: binary-without-manpage usr/bin/grep-changelog.emacs
-emacs-bin-common binary: binary-without-manpage usr/bin/rcs-checkin.emacs
+binary-without-manpage usr/bin/ctags.emacs
+binary-without-manpage usr/bin/ebrowse.emacs
+binary-without-manpage usr/bin/emacsclient.emacs
+binary-without-manpage usr/bin/etags.emacs

diff --git a/debian/emacs-common.lintian-overrides b/debian/emacs-common.lintian-overrides
deleted file mode 100644 (file)
index f5fc71d..0000000
--- a/debian/emacs-common.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-emacs-common binary: desktop-command-not-in-package /usr/share/applications/emacs.desktop emacs

diff --git a/debian/emacsVAR.lintian-overrides b/debian/emacsVAR.lintian-overrides
index d9fd67f4089eda2bd6349a4bc6b3d1ebe93053df..5df7f2c95af0ed6ed596c5316c8f5a3e25f69499 100644 (file)
--- a/debian/emacsVAR.lintian-overrides
+++ b/debian/emacsVAR.lintian-overrides
@@ -1,2 +1,2 @@
-@PKG_NAME@ binary: menu-icon-missing usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm
-@PKG_NAME@ binary: menu-icon-missing usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm
+# dpkg-maintscript-helper does not work due to arch:all to arch:any switch
+maintainer-script-may-use-dir_to_symlink_helper

diff --git a/debian/rules b/debian/rules
index 34be2ec8846136f976800aff4e4ca47acf74d19f..4067d900162ee05d8821735cbc2419fb8d4334f6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -128,10 +128,13 @@ nonpersistent_autogen_install_files := \
   debian/emacs-common.README.Debian \
   debian/emacs-common.postinst \
   debian/emacs-common.prerm \
+  debian/emacs-nox.lintian-overrides \
   debian/emacs-nox.postinst \
   debian/emacs-nox.prerm \
+  debian/emacs-lucid.lintian-overrides \
   debian/emacs-lucid.postinst \
   debian/emacs-lucid.prerm \
+  debian/emacs-gtk.lintian-overrides \
   debian/emacs-gtk.postinst \
   debian/emacs-gtk.prerm