(Removing Bug#460637 from CC, since that bug doesn’t depend on this one.)
Nikolaus Schulz wrote:
> On Sun, Mar 07, 2010 at 11:36:37PM -0600, Jonathan Nieder wrote:
>> retitle -1 Please remove outdated LinuxThreads manpages
>> forcemerge 572716 -1
>> severity -1 minor
>> block -1 by 519781
>> thanks
> [snip]
>> - The pages in man-pages are usable and maintained, and I think we should
>> ship them. This requires coordination between the two packages.
>> Actually, manpages-dev should be changed first (with Replaces: glibc-doc,
>> this requires no action by the glibc maintainers).
>
> Note that in order to avoid file conflicts, my patch for #519781 just
> adds pages to manpages-dev that are long removed from glibc-doc.
Good catch. Here’s the more complete (but more dangerous) patch.
Thoughts?
>From 14ee79f0d36e7dd2a33b86197bd1fbbb691698c3 Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrnie...@gmail.com>
Date: Fri, 26 Mar 2010 00:00:00 -0500
Subject: [PATCH] manpages-dev: Take over pthread_* namespace from glibc-doc
The LinuxThreads manpages included in glibc-doc are starting to show
their age, and the pages on pthreads in man-pages are usable and
maintained. I think we should start shipping the latter. This
requires coordination between the two packages. Actually,
manpages-dev gets the first move (with Replaces: glibc-doc, this
requires no action by the glibc maintainers).
An unversioned Replaces relation is very convenient, because it means we
can take our time removing relevant files from glibc-doc without
coordinating revisions to synchronize with this change.
The Replaces relation can be changed to a versioned Replaces as soon as
that work is complete. Even without such a change, as long as the
pages are removed from glibc-doc before squeeze is released, the
Replaces can be completely removed from manpages-dev for squeeze+1.
Note! If afterwards glibc-doc takes over some filenames from this
version of manpages-dev (before squeeze+1 is released), then glibc-doc
would have to use Conflicts rather than Replaces+Breaks to signal
that, making for a less pleasant upgrade. I have no reason to believe
this would happen, but it’s worth keeping in mind.
Thanks to Nikolaus Schulz <microsch...@web.de> for an initial patch.
---
debian/changelog | 28 ++++++++++++++++++++++++++++
debian/control | 2 +-
debian/inst | 12 +-----------
3 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 71b9947..320dc18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+manpages (3.24-1.1) experimental; urgency=low
+
+ * Added an unversioned Replaces entry against glibc-doc due to
+ old pthreads manpages shipped with glibc-doc.
+ * Distribute pthreads manpages that were removed in glibc-doc 2.9-1:
+ . pthread_attr_*(3)
+ . pthread_cleanup_*(3)
+ . pthread_create(3)
+ . pthread_detach(3)
+ . pthread_equal(3)
+ . pthread_exit(3)
+ . pthread_join(3)
+ . pthread_getschedparam(3)
+ . pthread_setschedparam(3)
+ . pthread_self(3)
+ . pthread_setcancelstate(3)
+ . pthread_setcanceltype(3)
+ . pthread_testcancel(3)
+ . pthread_cancel(3)
+ * Distribute more pthreads manpages to replace the ancient pages in
+ glibc-doc:
+ . pthread_kill(3)
+ . pthread_kill_other_threads_np(3)
+ . pthread_sigmask(3)
+ . sigwait(3)
+
+ -- Jonathan Nieder <jrnie...@gmail.com> Thu, 25 Mar 2010 23:22:13 -0500
+
manpages (3.24-1) unstable; urgency=low
* New upstream version
diff --git a/debian/control b/debian/control
index 6e6fd60..48a71ae 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Package: manpages-dev
Architecture: all
Depends: manpages
Suggests: man-browser
-Replaces: glibc-doc (<< 2.3.6-8)
+Replaces: glibc-doc
Priority: optional
Description: Manual pages about using GNU/Linux for development
These man pages describe the Linux programming interface, including
diff --git a/debian/inst b/debian/inst
index de035bc..62e6ca8 100644
--- a/debian/inst
+++ b/debian/inst
@@ -65,17 +65,7 @@ for i in man[23]; do
getxattr.2|lgetxattr.2|listxattr.2|llistxattr.2|lremovexattr.2|\
get_kernel_syms.2|create_module.2|delete_module.2|\
init_module.2|query_module.2|set_mempolicy.2|\
-
pthread_attr_destroy.3|pthread_attr_getdetachstate.3|pthread_cleanup_pop.3|\
-
pthread_attr_getscope.3|pthread_attr_init.3|pthread_attr_setdetachstate.3|\
-
pthread_attr_setscope.3|pthread_create.3|pthread_detach.3|pthread_equal.3|\
-
pthread_exit.3|pthread_join.3|pthread_self.3|pthread_attr_setschedpolicy.3|\
-
pthread_setschedparam.3|pthread_attr_setschedparam.3|pthread_attr_getschedparam.3|\
-
pthread_getschedparam.3|pthread_attr_getschedpolicy.3|pthread_cleanup_push.3|\
-
pthread_testcancel.3|pthread_setcancelstate.3|pthread_attr_getinheritsched.3|\
-
pthread_attr_setinheritsched.3|pthread_setcanceltype.3|pthread_cancel.3|\
-
pthread_cleanup_push_defer_np.3|pthread_cleanup_pop_restore_np.3|\
-
pthread_kill_other_threads_np.3|pthread_sigmask.3|pthread_kill.3|\
- lsetxattr.2|removexattr.2|setxattr.2|sigwait.3)
+ lsetxattr.2|removexattr.2|setxattr.2)
echo -n "(skipped)"
;;
*)
--
1.7.0.3
