Source: manpages-l10n
Severity: important
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hi,
Similiar to the psmisc issue, procps will have its own manpages and
there will be a conflict. I'll add in some lines to procps to help
but some files will need to be removed.
I used the following script:
+--------------------------------------------------
#!/bin/bash
mpdir="/home/csmall/Debian/manpages-l10n/manpages-l10n/po"
for myman in `ls -d man-po/*/*.[0-9]` ; do
IFS='/' read -r -a man_array <<< "$myman"
lang=${man_array[1]}
manpage=${man_array[2]}
section=`echo $manpage | cut -f 2 -d.`
theirman=$lang/man$section/$manpage.po
if [ -f $mpdir/$theirman ] ; then
echo $theirman
fi
done
+----------------------------------------------------------
This found a few conflicts:
de/man1/free.1.po
de/man1/kill.1.po
de/man1/pgrep.1.po
de/man1/pidof.1.po
de/man1/pmap.1.po
de/man1/ps.1.po
de/man1/pwdx.1.po
de/man1/slabtop.1.po
de/man8/sysctl.8.po
de/man1/tload.1.po
de/man1/uptime.1.po
de/man8/vmstat.8.po
de/man1/w.1.po
de/man1/watch.1.po
fr/man1/free.1.po
fr/man1/kill.1.po
fr/man1/pgrep.1.po
fr/man1/pmap.1.po
fr/man1/ps.1.po
fr/man1/pwdx.1.po
fr/man1/skill.1.po
fr/man1/slabtop.1.po
fr/man8/sysctl.8.po
fr/man1/tload.1.po
fr/man1/top.1.po
fr/man1/uptime.1.po
fr/man8/vmstat.8.po
fr/man1/watch.1.po
pl/man1/free.1.po
pl/man1/kill.1.po
pl/man1/uptime.1.po
The attached patch removes these conflicting files and adds the required
fields to the control file.
- -- System Information:
Debian Release: bullseye/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.10.0-3-amd64 (SMP w/8 CPU threads)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8),
LANGUAGE=en_AU:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-----BEGIN PGP SIGNATURE-----
iQJGBAEBCgAwFiEEXT3w9TizJ8CqeneiAiFmwP88hOMFAmAiaK0SHGNzbWFsbEBk
ZWJpYW4ub3JnAAoJEAIhZsD/PITj2EEP/2SsiXbAbyarCzkK6PRpg13YCI7cHcKL
HYo+xVVQ1RjEAwC91NE9sxdI+2L3udGAOkTtabDqjf0sAYgFsMjUBvHQge6JZkVj
tBGuwns1ll/Y+BAjtcnRj7hvhntv1DrAGRWiXdtnxhafQ3NRVkJWRCPvwXW60Lgx
wT3v4BbPNDri3C7i56CKo0ZDdZ+Pl9z4RwFIU5cd01puYhLURWAbUQTLKVLQnbDf
Eid/Ke1cK85xbkCu9EiKpmCREV3gSG21GARF5b8BhujScU0uYgZt5ecu9bfaOzTS
QdbB9MO8kaoElgDwzK4oO362TAlbrXdg5HqL6Vt/Tak2zuUGk48BIrs1bFbDZDGc
przouXO/tv+M8ANQFwY9SUfDpcce+ON50+yPDSJaht8mGwJKED/b5LKRq67clfuY
6kCuITGC84ozNvXUdNIliSFFpasM2o9yCl3qJ+K2UvEdvyGR441BHo/9g8vIaUfB
3iNLRWbOaRPlvRi6/HNOh0atJintPDQuUCAk5uv+C6M5RX+7cPUaP6XN8WKjTvMh
LFmCTldfvkWHzVTc6KJlorBC5I/1ZBVW5/TRCWaG7ruRsZpmP7jG2cgcOCudxHFz
qwSQRNt8UIK/bJRRhi7L3kWQVQm+l+HkP+Rbx7Jww+ZMtsF4NLBzWmquEtM2Oyi6
BJo0HM7AkqC0
=gQzP
-----END PGP SIGNATURE-----
diff --git a/debian/control b/debian/control
index e87cf78b7..d5ba47ebb 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Multi-Arch: foreign
Depends: ${misc:Depends}
Suggests: man-browser,
manpages
-Breaks: manpages-de-dev (<< 4), psmisc (<< 23.4-2)
+Breaks: manpages-de-dev (<< 4), psmisc (<< 23.4-2), procps (<< 3.3.17-1)
Replaces: manpages-de-dev (<< 4)
Description: German manpages
This package contains the Linux manual pages translated into German.
@@ -99,7 +99,7 @@ Multi-Arch: foreign
Depends: ${misc:Depends}
Suggests: man-browser,
manpages
-Breaks: manpages-fr-extra (<= 20151231)
+Breaks: manpages-fr-extra (<= 20151231), procps (<< 3.3.17-1)
Replaces: manpages-fr-extra (<= 20151231)
Description: French manpages
This package contains the Linux manual pages translated into French.
@@ -242,6 +242,7 @@ Multi-Arch: foreign
Depends: ${misc:Depends}
Suggests: man-browser,
manpages
+Breaks: procps (<< 3.3.17-1)
Description: Polish manpages
This package contains the Linux manual pages translated into Polish.
The following sections are included:
diff --git a/debian/rules b/debian/rules
index 02d141b72..6ca73de14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,6 +113,40 @@ override_dh_installman:
rm -f debian/manpages-pt-br-dev/usr/share/man/pt_BR/man3/intro.3
rm -f debian/manpages-ro-dev/usr/share/man/ro/man2/intro.2
rm -f debian/manpages-ro-dev/usr/share/man/ro/man3/intro.3
+ # Remove manpages from procps
+ rm -f debian/manpages-de/usr/share/man/de/man1/kill.1
+ rm -f debian/manpages-de/usr/share/man/de/man1/free.1
+ rm -f debian/manpages-de/usr/share/man/de/man1/kill.1
+ rm -f debian/manpages-de/usr/share/man/de/man1/pgrep.1
+ rm -f debian/manpages-de/usr/share/man/de/man1/pidof.1
+ rm -f debian/manpages-de/usr/share/man/de/man1/pmap.1
+ rm -f debian/manpages-de/usr/share/man/de/man1/ps.1
+ rm -f debian/manpages-de/usr/share/man/de/man1/pwdx.1
+ rm -f debian/manpages-de/usr/share/man/de/man1/slabtop.1
+ rm -f debian/manpages-de/usr/share/man/de/man8/sysctl.8
+ rm -f debian/manpages-de/usr/share/man/de/man1/tload.1
+ rm -f debian/manpages-de/usr/share/man/de/man1/uptime.1
+ rm -f debian/manpages-de/usr/share/man/de/man8/vmstat.8
+ rm -f debian/manpages-de/usr/share/man/de/man1/w.1
+ rm -f debian/manpages-de/usr/share/man/de/man1/watch.1
+ rm -f debian/manpages-fr/usr/share/man/fr/man1/free.1
+ rm -f debian/manpages-fr/usr/share/man/fr/man1/kill.1
+ rm -f debian/manpages-fr/usr/share/man/fr/man1/pgrep.1
+ rm -f debian/manpages-fr/usr/share/man/fr/man1/pmap.1
+ rm -f debian/manpages-fr/usr/share/man/fr/man1/ps.1
+ rm -f debian/manpages-fr/usr/share/man/fr/man1/pwdx.1
+ rm -f debian/manpages-fr/usr/share/man/fr/man1/skill.1
+ rm -f debian/manpages-fr/usr/share/man/fr/man1/slabtop.1
+ rm -f debian/manpages-fr/usr/share/man/fr/man8/sysctl.8
+ rm -f debian/manpages-fr/usr/share/man/fr/man1/tload.1
+ rm -f debian/manpages-fr/usr/share/man/fr/man1/top.1
+ rm -f debian/manpages-fr/usr/share/man/fr/man1/uptime.1
+ rm -f debian/manpages-fr/usr/share/man/fr/man8/vmstat.8
+ rm -f debian/manpages-fr/usr/share/man/fr/man1/watch.1
+ rm -f debian/manpages-pl/usr/share/man/pl/man1/free.1
+ rm -f debian/manpages-pl/usr/share/man/pl/man1/kill.1
+ rm -f debian/manpages-pl/usr/share/man/pl/man1/uptime.1
+
# Use epoch for Polish packages
override_dh_gencontrol:
