Lintian Fixes - mozc

Ready changes

Merge these changes:

git pull https://janitor.debian.net/git/mozc lintian-fixes/main

Summary

  • Trim trailing whitespace. (trailing-whitespace)
  • Move source package lintian overrides to debian/source. (old-source-override-location)
  • Update renamed lintian tag names in lintian overrides. (renamed-tag)
  • Remove obsolete field Name from debian/upstream/metadata (already present in machine-readable debian/copyright).
  • Remove 7 unused lintian overrides. (unused-override)

Diff

diff --git a/debian/changelog b/debian/changelog
index 8980a5cb..c281c44b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mozc (2.26.4220.100+dfsg-5) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Move source package lintian overrides to debian/source.
+  * Update renamed lintian tag names in lintian overrides.
+  * Remove obsolete field Name from debian/upstream/metadata (already present in
+    machine-readable debian/copyright).
+  * Remove 7 unused lintian overrides.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 08 Mar 2021 20:33:24 -0000
+
 mozc (2.26.4220.100+dfsg-4) unstable; urgency=medium
 
   * Fix typo in Exec of d/ibus-mozc-gnome-initial-setup.desktop.
@@ -411,7 +422,7 @@ mozc (1.4.1033.102-1) unstable; urgency=low
   * Update patches/support-kfreebsd.patch.
   * Update patches/uim-mozc.patch.
   * Remove unnecessary patches.
-    - patches/add_tegaki_ui_scim_mozc.patch 
+    - patches/add_tegaki_ui_scim_mozc.patch
     - patches/add_tegaki_ui_ibus_mozc.patch
   * Add patches/emacs_fix.patch (Upstream#146). Fix work on emacs.
   * Enable gtk_renderer.
@@ -522,7 +533,7 @@ mozc (1.2.809.102-1) unstable; urgency=low
 
 mozc (1.1.773.102-1) unstable; urgency=low
 
-  * New upstream release (r58). 
+  * New upstream release (r58).
 
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Fri, 22 Jul 2011 08:19:04 +0900
 
@@ -550,7 +561,7 @@ mozc (1.1.717.102-1) unstable; urgency=low
 
 mozc (1.1.690.102-1) unstable; urgency=low
 
-  * New upstream release (r55). 
+  * New upstream release (r55).
   * Update debian/control.
     - Add libzinnia-dev to Build-Depends
     - Add tegaki-zinnia-japanese to Depends of scim and ibus
@@ -559,9 +570,9 @@ mozc (1.1.690.102-1) unstable; urgency=low
     - Update patches/support-kfreebsd.patch
     - Add patch UI of tegaki I/F for ibus-mozc
     - Add patch UI of tegaki I/F for mozc-scim
- 
+
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Sat, 23 Apr 2011 04:14:54 +0900
- 
+
 mozc (1.1.626.102-2) unstable; urgency=low
 
   * Fix invalid syntax in startup file for emacs-mozc (Closes: #619512).
diff --git a/debian/control b/debian/control
index 273fa87c..a2d4163e 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Architecture: all
 Depends: ${misc:Depends}
 Multi-Arch: foreign
 Description: Mozc input method - data files
- Mozc is a Japanese Input Method Editor (IME) designed for multi-platform 
+ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
  such as Chromium OS, Windows, Mac and Linux.
  .
  This package provides the essential data files.
@@ -72,7 +72,7 @@ Description: Mozc engine for IBus - Client of the Mozc input method
  It provides full featured and user friendly input method user interface.
  It also may help developers to develop input method easily.
  .
- Mozc is a Japanese Input Method Editor (IME) designed for multi-platform 
+ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
  such as Chromium OS, Windows, Mac and Linux.
  .
  ibus-mozc provides client part of the Mozc input method.
@@ -89,14 +89,14 @@ Depends:
 Recommends: mozc-utils-gui (= ${binary:Version})
 Multi-Arch: same
 Description: Mozc engine for uim - Client of the Mozc input method
- uim is an input method module library supporting various languages, which 
- become a frontend for Anthy, SKK, Canna, T-Code, TUT-Code, 
- Pinyin (Chinese input method), Hangul (Korean input method), 
+ uim is an input method module library supporting various languages, which
+ become a frontend for Anthy, SKK, Canna, T-Code, TUT-Code,
+ Pinyin (Chinese input method), Hangul (Korean input method),
  IPA (International Phonetic Alphabet), etc.
- Most of the functions are implemented with Scheme, so it's very simple 
+ Most of the functions are implemented with Scheme, so it's very simple
  and flexible.
  .
- Mozc is a Japanese Input Method Editor (IME) designed for multi-platform 
+ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
  such as Chromium OS, Windows, Mac and Linux.
  .
  uim-mozc provides client part of the Mozc input method.
@@ -122,8 +122,8 @@ Description: Mozc engine for fcitx - Client of the Mozc input method
  using a variety of mapping systems.
  .
  It offers a pleasant and modern experience, with intuitive graphical
- configuration tools and customizable skins and mapping tables. 
- It is highly modularized and extensible, with GTK+ 2/3 and Qt4 IM Modules, 
+ configuration tools and customizable skins and mapping tables.
+ It is highly modularized and extensible, with GTK+ 2/3 and Qt4 IM Modules,
  support for UIs based on Fbterm, pure Xlib, GTK+, or KDE, and
  a developer-friendly API.
  .
@@ -147,8 +147,8 @@ Description: Mozc engine for fcitx5 - Client of the Mozc input method
  using a variety of mapping systems.
  .
  It offers a pleasant and modern experience, with intuitive graphical
- configuration tools and customizable skins and mapping tables. 
- It is highly modularized and extensible, with GTK+ 2/3 and Qt4 IM Modules, 
+ configuration tools and customizable skins and mapping tables.
+ It is highly modularized and extensible, with GTK+ 2/3 and Qt4 IM Modules,
  support for UIs based on Fbterm, pure Xlib, GTK+, or KDE, and
  a developer-friendly API.
  .
@@ -161,7 +161,7 @@ Depends:
  emacs-mozc-bin (= ${binary:Version})
 Conflicts: emacsen-common (<< 2.0.0)
 Description: Mozc for Emacs
- Mozc is a Japanese Input Method Editor (IME) designed for multi-platform 
+ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
  such as Chromium OS, Windows, Mac and Linux.
  .
  This package provides the elisp files to run mozc with GNU Emacs.
@@ -175,7 +175,7 @@ Depends:
  ${shlibs:Depends},
  mozc-server (= ${binary:Version})
 Description: Helper module for emacs-mozc
- Mozc is a Japanese Input Method Editor (IME) designed for multi-platform 
+ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
  such as Chromium OS, Windows, Mac and Linux.
  .
  This package provides the helper module to the GNU Emacs.
@@ -189,7 +189,7 @@ Depends:
  ${shlibs:Depends}
 Multi-Arch: foreign
 Description: Server of the Mozc input method
- Mozc is a Japanese Input Method Editor (IME) designed for multi-platform 
+ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
  such as Chromium OS, Windows, Mac and Linux.
  .
  mozc-server provides GUI utilities of the Mozc input method.
@@ -206,7 +206,7 @@ Depends:
 Recommends: mozc-server (= ${binary:Version})
 Suggests: ibus-qt5
 Description: GUI utilities of the Mozc input method
- Mozc is a Japanese Input Method Editor (IME) designed for multi-platform 
+ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform
  such as Chromium OS, Windows, Mac and Linux.
  .
  mozc-server provides GUI uitilities of the Mozc input method.
diff --git a/debian/emacs-mozc-bin.lintian-overrides b/debian/emacs-mozc-bin.lintian-overrides
index 43e3d772..49ee0fea 100644
--- a/debian/emacs-mozc-bin.lintian-overrides
+++ b/debian/emacs-mozc-bin.lintian-overrides
@@ -1 +1 @@
-emacs-mozc-bin: binary-without-manpage usr/bin/mozc_emacs_helper
+emacs-mozc-bin: no-manual-page usr/bin/mozc_emacs_helper
diff --git a/debian/fcitx-mozc.lintian-overrides b/debian/fcitx-mozc.lintian-overrides
deleted file mode 100644
index 0e52a1bd..00000000
--- a/debian/fcitx-mozc.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-fcitx-mozc: shared-library-lacks-version usr/lib/x86_64-linux-gnu/fcitx-mozc.so fcitx-mozc.so
-fcitx-mozc: lacks-ldconfig-trigger usr/lib/x86_64-linux-gnu/fcitx-mozc.so
diff --git a/debian/rules b/debian/rules
index 32441e7a..28c3f25f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ build_dynamic_link:
 	cd src ; \
 	GYP_DEFINES="use_libprotobuf=1 use_libzinnia=1 use_libabseil=1" python3 build_mozc.py gyp \
 		--gypdir=/usr/bin --target_platform=Linux --verbose ; \
-	python3 build_mozc.py build $(TARGETS)  -c Release 
+	python3 build_mozc.py build $(TARGETS)  -c Release
 	cd src ; \
 	python3 build_mozc.py build $(TARGET_FCITX) -c Release
 	cd src ; \
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index c29fefec..00000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-mozc source: source-is-missing src/chrome/nacl/inputview/inputview.js line length is 337 characters (>256)
-mozc source: source-is-missing src/chrome/nacl/inputview/config/jp.js line length is 896 characters (>512)
-mozc source: source-is-missing src/chrome/nacl/inputview/config/us.js line length is 792 characters (>512)
-mozc source: source-is-missing src/chrome/nacl/inputview/inputview_layouts/101kbd.js line length is 749 characters (>512)
-mozc source: source-is-missing src/chrome/nacl/inputview/inputview_layouts/compactkbd.js line length is 425 characters (>256)
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index f67c3fe2..0e038ef2 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,4 +1,3 @@
-Name: mozc
 Repository: https://github.com/google/mozc.git/
 Repository-Browse: https://github.com/google/mozc/
 Bug-Database: https://github.com/google/mozc/issues

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/share/lintian/overrides/fcitx-mozc

No differences were encountered between the control files of package emacs-mozc

No differences were encountered between the control files of package emacs-mozc-bin

No differences were encountered between the control files of package emacs-mozc-bin-dbgsym

No differences were encountered between the control files of package fcitx-mozc

No differences were encountered between the control files of package fcitx-mozc-data

No differences were encountered between the control files of package fcitx-mozc-dbgsym

No differences were encountered between the control files of package fcitx5-mozc

No differences were encountered between the control files of package fcitx5-mozc-dbgsym

No differences were encountered between the control files of package ibus-mozc

No differences were encountered between the control files of package ibus-mozc-dbgsym

No differences were encountered between the control files of package mozc-data

No differences were encountered between the control files of package mozc-server

No differences were encountered between the control files of package mozc-server-dbgsym

No differences were encountered between the control files of package mozc-utils-gui

No differences were encountered between the control files of package mozc-utils-gui-dbgsym

No differences were encountered between the control files of package uim-mozc

No differences were encountered between the control files of package uim-mozc-dbgsym

Run locally

Try this locally (using the lintian-brush package):

debcheckout mozc
cd mozc
lintian-brush

More details

Full run details