Merging debian version 6.7-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 24 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 1a9a2e8..77402be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+manpages (6.7-2) unstable; urgency=medium
+
+  [ Marcos Fouces ]
+  * Add breaks/replace in manpage-dev (Thanks to Andreas Beckman).
+
+  [ Sven Joachim ]
+  * d/check-conflicts: avoid large temporary file
+  * d/check-conflicts: also check for manpages in arch:all packages
+  * Update d/rules with check-conflicts script (Closes: #1068166)
+
+ -- Marcos Fouces <marcos@debian.org>  Tue, 02 Apr 2024 18:20:34 +0200
+
 manpages (6.7-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/check-conflicts b/debian/check-conflicts
index 2b16b51..cb8a54b 100755
--- a/debian/check-conflicts
+++ b/debian/check-conflicts
@@ -1,14 +1,12 @@
 #!/bin/sh
 
-echo "Getting the contents file from sid for amd64 ..."
+echo "Getting the contents files from sid for amd64 and all ..."
 wget --quiet https://deb.debian.org/debian/dists/sid/main/Contents-amd64.gz
-
-echo "Decompressing the contents file ..."
-gzip -d Contents-amd64.gz
+wget --quiet https://deb.debian.org/debian/dists/sid/main/Contents-all.gz
 
 echo "Filtering out only manpages ..."
-grep "^usr/share/man/man*" Contents-amd64 > only-manpages.txt
-rm -f Contents-amd64
+gzip -dc Contents-amd64.gz Contents-all.gz | grep "^usr/share/man/man*" > only-manpages.txt
+rm -f Contents-amd64.gz Contents-all.gz
 
 echo "Searching for conflicting manpages ..."
 for manpage in man*/* ; do
diff --git a/debian/control b/debian/control
index e5fd875..0b735a2 100644
--- a/debian/control
+++ b/debian/control
@@ -40,8 +40,8 @@ Architecture: all
 Multi-Arch: foreign
 Depends: manpages, ${misc:Depends}
 Suggests: man-browser
-Replaces: inn2-dev (<< 2.7.0-1)
-Breaks: manpages (<< 6.01-1), inn2-dev (<< 2.7.0-1)
+Replaces: inn2-dev (<< 2.7.0-1), manpages (<< 6.7-1)
+Breaks: manpages (<< 6.7-1), inn2-dev (<< 2.7.0-1)
 Priority: optional
 Description: Manual pages about using GNU/Linux for development
  These man pages describe the Linux programming interface, including
diff --git a/debian/rules b/debian/rules
index e159816..dfd7a86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,14 @@ override_dh_installman:
 	rm -f debian/manpages-dev/usr/share/man/man3/crypt.3
 	rm -f debian/manpages-dev/usr/share/man/man3/crypt_r.3
 	rm -f debian/manpages-dev/usr/share/man/man3/pthread_atfork.3
+	rm -f debian/manpages-dev/usr/share/man/man3/pthread_cond_init.3
+	rm -f debian/manpages-dev/usr/share/man/man3/pthread_condattr_init.3
+	rm -f debian/manpages-dev/usr/share/man/man3/pthread_key_create.3
+	rm -f debian/manpages-dev/usr/share/man/man3/pthread_mutex_init.3
 	rm -f debian/manpages-dev/usr/share/man/man3/pthread_mutexattr_destroy.3
 	rm -f debian/manpages-dev/usr/share/man/man3/pthread_mutexattr_init.3
+	rm -f debian/manpages-dev/usr/share/man/man3/pthread_mutexattr_setkind_np.3
+	rm -f debian/manpages-dev/usr/share/man/man3/pthread_once.3
 	rm -f debian/manpages/usr/share/man/man4/fd.4
 	rm -f debian/manpages/usr/share/man/man5/ftpusers.5
 	rm -f debian/manpages/usr/share/man/man5/nscd.conf.5