Bug#982059: manpages-de: procps: File sconflict between procps and manpages-de

[Sedat Dilek]

On Wed, Feb 10, 2021 at 7:05 PM Sedat Dilek <sedat.di...@gmail.com> wrote:
>
> Hi,
>
> I modified Craig's procps_manpage.diff as it still shows conflicts on
> manpages-de installation: e.g. man5/sysctl.conf.5.
>
> Attached is my manpages-de_procps_dileks.debdiff.
> The list of file-removal is alphabetically sorted.
> The debdiff is on top of (pending) manpages-l10n 4.9.1-2 solving
> issues for me with manpages-de (only).
>

Schei...benkleister - means in German politely sh*t.

I forgot... man8/vmstat.8 in the file-removal list.


$ git diff manpages-de_procps_dileks.debdiff
manpages-de_procps_dileks-v2.debdiff
diff --git a/manpages-de_procps_dileks.debdiff
b/manpages-de_procps_dileks-v2.debdiff
index ae2b07c4153a..f53f878e08ce 100644
--- a/manpages-de_procps_dileks.debdiff
+++ b/manpages-de_procps_dileks-v2.debdiff
@@ -30,7 +30,7 @@ diff -Nru manpages-l10n-4.9.1/debian/control
manpages-l10n-4.9.1/debian/control
diff -Nru manpages-l10n-4.9.1/debian/rules manpages-l10n-4.9.1/debian/rules
--- manpages-l10n-4.9.1/debian/rules   2021-01-24 12:19:47.000000000 +0100
+++ manpages-l10n-4.9.1/debian/rules   2021-02-10 17:20:06.000000000 +0100
-@@ -113,6 +113,17 @@
+@@ -113,6 +113,18 @@
       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
@@ -45,6 +45,7 @@ diff -Nru manpages-l10n-4.9.1/debian/rules
manpages-l10n-4.9.1/debian/rules
+      rm -f debian/manpages-de/usr/share/man/de/man1/w.1
+      rm -f debian/manpages-de/usr/share/man/de/man5/sysctl.conf.5
+      rm -f debian/manpages-de/usr/share/man/de/man8/sysctl.8
++      rm -f debian/manpages-de/usr/share/man/de/man8/vmstat.8

 # Use epoch for Polish packages
 override_dh_gencontrol:

Attached is v2 of my debdiff.

- Sedat -

manpages-de_procps_dileks-v2.debdiff
Description: Binary data