[elbe-devel] [PATCH v2 22/27] debian: Fix a lot of lintian lints
Torben Hohn
torben.hohn at linutronix.de
Thu Sep 24 16:56:19 CEST 2020
From: Bastian Germann <bage at linutronix.de>
E: python3-elbe-buildenv: shell-script-fails-syntax-check usr/lib/python3/dist-packages/elbepack/makofiles/toolchain-shar-extract.sh.mako
W: elbe source: debhelper-but-no-misc-depends python3-elbe-bin
W: elbe-updated: extended-description-line-too-long line 3
W: elbe source: global-files-wildcard-not-first-paragraph-in-dep5-copyright (line 20)
W: elbe source: globbing-patterns-out-of-order elbepack/makofiles/toolchain-shar-extract.sh.mako *
W: elbe-updated: maintainer-script-empty postrm
W: elbe-updated: maintainer-script-ignores-errors postinst
W: elbe-updated: maintainer-script-ignores-errors postrm
W: elbe-updated: maintainer-script-ignores-errors prerm
W: elbe source: maintainer-script-lacks-debhelper-token debian/elbe-updated.postinst
W: elbe source: maintainer-script-lacks-debhelper-token debian/elbe-updated.postrm
W: elbe source: maintainer-script-lacks-debhelper-token debian/elbe-updated.prerm
W: elbe source: maintainer-script-lacks-debhelper-token debian/elbe.postinst
W: elbe-updated: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/elbe-updated
W: python3-elbe-buildenv: script-not-executable usr/lib/python3/dist-packages/elbepack/makofiles/toolchain-shar-extract.sh.mako
I: elbe-schema: capitalization-error-in-description linux Linux
I: python3-elbe-bin: capitalization-error-in-description linux Linux
I: python3-elbe-bin: capitalization-error-in-description python Python
I: python3-elbe-common: capitalization-error-in-description linux Linux
I: elbe-debianize: capitalization-error-in-description-synopsis debian Debian
I: python3-elbe-bin: conflicts-with-version elbe (<< 12.3)
I: elbe: systemd-service-file-missing-documentation-key lib/systemd/system/elbe.service
I: elbe-daemon: systemd-service-file-missing-documentation-key lib/systemd/system/elbe-daemon.service
I: elbe-updated: systemd-service-file-missing-documentation-key lib/systemd/system/elbe-updated.service
I: elbe-doc: typo-in-manual-page usr/share/man/man1/elbe-control.1.gz "allows to" "allows one to"
I: elbe-doc: typo-in-manual-page usr/share/man/man1/elbe-initvm.1.gz "Allows to" "Allows one to"
I: elbe-doc: typo-in-manual-page usr/share/man/man1/elbe-initvm.1.gz "allows to" "allows one to"
I: elbe-doc: typo-in-manual-page usr/share/man/man1/elbe-pbuilder.1.gz "Allows to" "Allows one to"
I: elbe-doc: typo-in-manual-page usr/share/man/man1/elbe-pbuilder.1.gz "allows to" "allows one to"
I: python3-elbe-bin: typo-in-manual-page usr/share/man/man1/elbe.1.gz "allows to" "allows one to"
I: elbe source: unused-file-paragraph-in-dep5-copyright paragraph at line 5
I: elbe source: wildcard-matches-nothing-in-dep5-copyright elbepack/makofiles/toolchain-shar-extract.sh.mako (line 5)
I: python3-elbe-common: wrong-section-according-to-package-name python3-elbe-common => python
P: elbe source: insecure-copyright-format-uri http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
P: elbe source: silent-on-rules-requiring-root
P: elbe source: trailing-whitespace debian/changelog (line 965)
Signed-off-by: Bastian Germann <bage at linutronix.de>
Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>
Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
---
debian/changelog | 2 +-
debian/control | 22 +++++++++++--------
debian/copyright | 21 +++++++++---------
debian/elbe.lintian-overrides | 1 -
debian/elbe.postinst | 6 -----
debian/elbe.service | 1 +
.../python3-elbe-buildenv.lintian-overrides | 4 ++++
debian/python3-elbe-daemon.service | 1 +
debian/python3-elbe-updated.postinst | 3 +++
debian/python3-elbe-updated.postrm | 4 ++++
debian/python3-elbe-updated.prerm | 4 ++++
debian/python3-elbe-updated.service | 1 +
debian/rules | 7 ++----
docs/elbe-control.txt | 2 +-
docs/elbe-initvm.txt | 4 ++--
docs/elbe-pbuilder.txt | 4 ++--
docs/elbe.txt | 2 +-
17 files changed, 50 insertions(+), 39 deletions(-)
delete mode 100644 debian/elbe.lintian-overrides
delete mode 100644 debian/elbe.postinst
create mode 100644 debian/python3-elbe-buildenv.lintian-overrides
diff --git a/debian/changelog b/debian/changelog
index c3e1c4626..b76dfde8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -962,7 +962,7 @@ elbe (0.5.4~wheezy) unstable; urgency=low
elbe (0.5.4~squeeze) unstable; urgency=low
* BUGFIX dump.py crashed because of missing version.py on target
- * add dump.py output to elbe-report.txt
+ * add dump.py output to elbe-report.txt
-- Manuel Traut <manut at linutronix.de> Tue, 01 Oct 2013 17:20:53 +0200
diff --git a/debian/control b/debian/control
index 423673df1..228c466f3 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 10),
xml-core,
pandoc
Standards-Version: 3.9.6
+Rules-Requires-Root: no
Homepage: http://elbe-rfs.org
Package: elbe-doc
@@ -32,21 +33,24 @@ Architecture: all
Conflicts: elbe-common
Depends: ${misc:Depends}
Description: xml schema files
- Common files for ELBE (embedded linux build environment). These
+ Common files for ELBE (embedded Linux build environment). These
schemas are used by ELBE.
Package: python3-elbe-bin
-Conflicts: elbe (<< 12.3), elbe-common, python-elbe-bin
+Conflicts: elbe-common, python-elbe-bin
+Breaks: elbe (<< 12.3)
Architecture: all
-Depends: python3-elbe-common (= ${binary:Version}),
+Depends: ${misc:Depends},
+ python3-elbe-common (= ${binary:Version}),
python3,
python3-mako,
debian-archive-keyring (>= 2017.5+deb9u1)
Description: elbe executable
- Common files for ELBE (embedded linux build environment). These
- python modules are shared by several elbe subcommands.
+ Common files for ELBE (embedded Linux build environment). These
+ Python modules are shared by several elbe subcommands.
Package: python3-elbe-common
+Section: python
Architecture: all
Depends: ${misc:Depends},
elbe-schema (= ${binary:Version}),
@@ -58,7 +62,7 @@ Depends: ${misc:Depends},
wget,
cpio
Description: common files
- Common files for ELBE (embedded linux build environment). These
+ Common files for ELBE (embedded Linux build environment). These
python-modules are shared by several elbe subcommands.
Package: python3-elbe-debianize
@@ -72,7 +76,7 @@ Depends: ${misc:Depends},
python3-elbe-common (= ${binary:Version}),
python3-urwid,
python3-pkg-resources
-Description: Wizard for debian folder generation
+Description: Wizard for Debian folder generation
Assists users in generating a debianization for a given source code project.
Package: elbe
@@ -195,6 +199,6 @@ Suggests: python3-pyudev,
Description: update daemon for embedded systems
This package is typically installed on a embedded system. The update daemon
monitors a directory or USB mounts. If an ELBE update file (generated by
- 'elbe gen_update' command from the 'python3-elbe-buildenv' package) is placed in this
- directory the update will be applied.
+ 'elbe gen_update' command from the 'python3-elbe-buildenv' package) is placed
+ in this directory the update will be applied.
Downgrades are possible by the integrated SOAP interface.
diff --git a/debian/copyright b/debian/copyright
index 839d360da..84a519dce 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,16 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: elbe
+Upstream-Contact: Linutronix GmbH <info at linutronix.de>
Source: https://github.com/Linutronix/elbe/
+Files: *
+Copyright: (c) 2013, Torben Hohn, Linutronix GmbH, Manuel Traut, Linutronix GmbH
+License: GPL-3+
+ SPDX-License-Identifier: GPL-3.0-or-later
+ On Debian systems, the full text of the GNU General Public
+ License version 3+ can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
Files: elbepack/makofiles/toolchain-shar-extract.sh.mako
Copyright: Aníbal Limón <anibal.limon at linux.intel.com>
Brendan Le Foll <brendan.le.foll at intel.com>
@@ -15,16 +24,6 @@ Copyright: Aníbal Limón <anibal.limon at linux.intel.com>
Robert Yang <liezhi.yang at windriver.com>
Todor Minchev <todor.minchev at linux.intel.com>
Wenlin Kang <wenlin.kang at windriver.com>
-License: GPL-2
-
-Files: *
-Copyright: (c) 2013, Torben Hohn, Linutronix GmbH, Manuel Traut, Linutronix GmbH
-License: GPL-3+
- SPDX-License-Identifier: GPL-3.0-or-later
- On Debian systems, the full text of the GNU General Public
- License version 3+ can be found in the file
- `/usr/share/common-licenses/GPL-3'.
-
License: GPL-2
SPDX-License-Identifier: GPL-2.0-only
On Debian systems, the full text of the GNU General Public
diff --git a/debian/elbe.lintian-overrides b/debian/elbe.lintian-overrides
deleted file mode 100644
index b48679730..000000000
--- a/debian/elbe.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-elbe: postrm-contains-additional-updaterc.d-calls etc/init.d/elbe
diff --git a/debian/elbe.postinst b/debian/elbe.postinst
deleted file mode 100644
index eaacfb0f7..000000000
--- a/debian/elbe.postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-# this is needed for jessie, in subsequent releases it is already go readable
-if [ -f /etc/apt/trusted.gpg ]; then
- chmod go+r /etc/apt/trusted.gpg
-fi
diff --git a/debian/elbe.service b/debian/elbe.service
index c19bd1728..b32a6e9f9 100644
--- a/debian/elbe.service
+++ b/debian/elbe.service
@@ -1,5 +1,6 @@
[Unit]
Description=ELBE initvm
+Documentation=man:elbe-daemon(1)
[Service]
Type=forking
diff --git a/debian/python3-elbe-buildenv.lintian-overrides b/debian/python3-elbe-buildenv.lintian-overrides
new file mode 100644
index 000000000..af85ad2e5
--- /dev/null
+++ b/debian/python3-elbe-buildenv.lintian-overrides
@@ -0,0 +1,4 @@
+# The shell script is a template
+python3-elbe-buildenv: shell-script-fails-syntax-check usr/lib/python3/dist-packages/elbepack/makofiles/toolchain-shar-extract.sh.mako
+# The shell script is a template
+python3-elbe-buildenv: script-not-executable usr/lib/python3/dist-packages/elbepack/makofiles/toolchain-shar-extract.sh.mako
diff --git a/debian/python3-elbe-daemon.service b/debian/python3-elbe-daemon.service
index 26619b918..642b96f3d 100644
--- a/debian/python3-elbe-daemon.service
+++ b/debian/python3-elbe-daemon.service
@@ -1,5 +1,6 @@
[Unit]
Description=ELBE Daemon
+Documentation=man:elbe-daemon(1)
[Service]
Type=simple
diff --git a/debian/python3-elbe-updated.postinst b/debian/python3-elbe-updated.postinst
index 858d8cdab..cb2adf8ca 100644
--- a/debian/python3-elbe-updated.postinst
+++ b/debian/python3-elbe-updated.postinst
@@ -1,4 +1,7 @@
#!/bin/sh
+set -e
+
+#DEBHELPER#
# ATTENTION: don't add code that restarts the elbe-updated here
# the update itself might be running inside an elbe-updated process if
diff --git a/debian/python3-elbe-updated.postrm b/debian/python3-elbe-updated.postrm
index 439a67a09..b8382db99 100644
--- a/debian/python3-elbe-updated.postrm
+++ b/debian/python3-elbe-updated.postrm
@@ -1,4 +1,8 @@
#!/bin/sh
+set -e
+
+#DEBHELPER#
+
#
# ATTENTION: don't add code that restarts the elbe-updated here
# the update itself might be running inside an elbe-updated process if
diff --git a/debian/python3-elbe-updated.prerm b/debian/python3-elbe-updated.prerm
index 1fce865b5..721b48909 100644
--- a/debian/python3-elbe-updated.prerm
+++ b/debian/python3-elbe-updated.prerm
@@ -1,4 +1,8 @@
#!/bin/sh
+set -e
+
+#DEBHELPER#
+
#
# ATTENTION: don't add code that restarts the elbe-updated here
# the update itself might be running inside an elbe-updated process if
diff --git a/debian/python3-elbe-updated.service b/debian/python3-elbe-updated.service
index 4520d726d..55d6aedc3 100644
--- a/debian/python3-elbe-updated.service
+++ b/debian/python3-elbe-updated.service
@@ -1,5 +1,6 @@
[Unit]
Description=ELBE Update Daemon
+Documentation=man:elbe-updated(1)
[Service]
Type=simple
diff --git a/debian/rules b/debian/rules
index f4a1d3af0..dc74597e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,11 +18,8 @@ override_dh_clean:
override_dh_compress:
dh_compress -X.xml
-override_dh_systemd_start:
- dh_systemd_start --no-package=elbe
-
-override_dh_systemd_stop:
- dh_systemd_stop --no-package=elbe
+override_dh_installinit:
+ dh_installinit --no-package=elbe
override_dh_install:
dh_install
diff --git a/docs/elbe-control.txt b/docs/elbe-control.txt
index 63164025a..d2893dcc3 100644
--- a/docs/elbe-control.txt
+++ b/docs/elbe-control.txt
@@ -37,7 +37,7 @@ DESCRIPTION
Low Level interface to
control an elbe daemon running inside an initvm.
-It allows to submit xml files etc.
+It allows one to submit xml files etc.
For the high level interface, see 'elbe initvm'
diff --git a/docs/elbe-initvm.txt b/docs/elbe-initvm.txt
index 00dbec23c..df0e5380e 100644
--- a/docs/elbe-initvm.txt
+++ b/docs/elbe-initvm.txt
@@ -4,7 +4,7 @@ elbe-initvm(1)
NAME
----
elbe-initvm - High Level Interface to the ELBE System.
- Allows to create an initvm and directly build Rootfilesystems using ELBE.
+ Allows one to create an initvm and directly build Rootfilesystems using ELBE.
SYNOPSIS
@@ -20,7 +20,7 @@ SYNOPSIS
DESCRIPTION
-----------
-This command allows to build and manage an initvm.
+This command allows one to build and manage an initvm.
Initvms are managed via libvirt, and its necessary, that a user is a member of the
libvirt group.
diff --git a/docs/elbe-pbuilder.txt b/docs/elbe-pbuilder.txt
index be220a14c..80feabd19 100644
--- a/docs/elbe-pbuilder.txt
+++ b/docs/elbe-pbuilder.txt
@@ -4,7 +4,7 @@ elbe-pbuilder(1)
NAME
----
elbe-pbuilder - High Level Interface to the ELBE Package Build System.
- Allows to create a package builder for a project and to build
+ Allows one to create a package builder for a project and to build
Debian packages.
@@ -35,7 +35,7 @@ OPTIONS
--cpuset <int>::
When this value is not -1 (the default), the pbuilder is run using
- 'taskset <cpuset>' which allows to limit the number of cpus used
+ 'taskset <cpuset>' which allows one to limit the number of cpus used
for the build. This is useful when multithreading and qemu-user
yield problem with e.g. java.
diff --git a/docs/elbe.txt b/docs/elbe.txt
index f9d1927f9..a2d7340bf 100644
--- a/docs/elbe.txt
+++ b/docs/elbe.txt
@@ -24,7 +24,7 @@ Elbe COMMANDS
-------------
linkgit:elbe-initvm[1]::
- build and manage initvm. Also allows to submit xml Files into the initvm
+ build and manage initvm. Also allows one to submit xml Files into the initvm
linkgit:elbe-control[1]::
low-level interface to projects inside the initvm.
--
2.20.1
More information about the elbe-devel
mailing list