Bug#858190: unblock: manpages/4.10-1

[Dr. Tobias Quathamer]

control: reopen -1
control: retitle -1 unblock: manpages/4.10-2

Am 04.04.2017 um 18:51 schrieb Sven Joachim:

Unfortunately it introduced at least two file conflicts, #859511 and
#859514.  Can you please drop the offending files for now and check
whether there are other clashes in newly added manpages?

unblock manpages/4.10-2

Thanks a lot and sorry for the mess,
Tobias


diff -Nru manpages-4.10/debian/changelog manpages-4.10/debian/changelog
--- manpages-4.10/debian/changelog	2017-04-04 13:50:44.000000000 +0200
+++ manpages-4.10/debian/changelog	2017-04-05 20:17:49.000000000 +0200
@@ -1,3 +1,9 @@
+manpages (4.10-2) unstable; urgency=medium
+
+  * Remove conflicting files. (Closes: #859514, #859511)
+
+ -- Dr. Tobias Quathamer <to...@debian.org>  Wed, 05 Apr 2017 20:17:49 +0200
+
 manpages (4.10-1) unstable; urgency=medium
 
   * Imported Upstream version 4.10
diff -Nru manpages-4.10/debian/rules manpages-4.10/debian/rules
--- manpages-4.10/debian/rules	2017-04-04 13:50:44.000000000 +0200
+++ manpages-4.10/debian/rules	2017-04-05 20:17:40.000000000 +0200
@@ -46,6 +46,16 @@
 	rm -f debian/manpages/usr/share/man/man4/sk98lin.4
 	# Temporary fix: Do not install tmpfs.5, see https://bugs.debian.org/847998
 	rm -f debian/manpages/usr/share/man/man5/tmpfs.5
+	# Provided by libbsd-dev
+	rm -f debian/manpages-dev/usr/share/man/man3/explicit_bzero.3
+	# Provided by keyutils
+	rm -f debian/manpages/usr/share/man/man7/keyrings.7
+	rm -f debian/manpages/usr/share/man/man7/persistent-keyring.7
+	rm -f debian/manpages/usr/share/man/man7/process-keyring.7
+	rm -f debian/manpages/usr/share/man/man7/session-keyring.7
+	rm -f debian/manpages/usr/share/man/man7/thread-keyring.7
+	rm -f debian/manpages/usr/share/man/man7/user-keyring.7
+	rm -f debian/manpages/usr/share/man/man7/user-session-keyring.7
 
 # manpages-dev has no docs dir
 override_dh_installdocs:

Yes, I'm sorry about that. I've now removed all files which conflict with manpages from other packages. The debdiff to this new version is attached. I'd be glad if this new upload could be considered for an unblock as well.

signature.asc
Description: OpenPGP digital signature