Merging debian version 6.8-2.

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

4 files changed, 36 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 6c3225c..ce9c2a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+manpages (6.8-2) unstable; urgency=medium
+
+  * Remove packages from Build-Depends to allow migration to testing.
+    There's no clear explanation in d/changelog or the commit
+    messages as to why all those packages should be needed.
+    However, it hinders testing migration (currently due to the
+    dependency on iwyu).
+  * Use wrap-and-sort -at
+  * Add missing Breaks and Replaces glibc-doc (<< 2.37-16) for manpages-dev.
+    Thanks to Andreas Beckmann <anbe@debian.org> (Closes: #1072158)
+
+ -- Dr. Tobias Quathamer <toddy@debian.org>  Fri, 07 Jun 2024 23:16:21 +0200
+
 manpages (6.8-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-updates, remaining changes:
diff --git a/debian/control b/debian/control
index 2b10ec3..6e3097c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,12 @@ Section: doc
 Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
 XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
 XSBC-Original-Maintainer: Dr. Tobias Quathamer <toddy@debian.org>
-XSBC-Original-Uploaders: Marcos Fouces <marcos@debian.org>
+XSBC-Original-Uploaders: Marcos Fouces <marcos@debian.org>,
 Bugs: mailto:maintainers@lists.progress-linux.org
 Priority: standard
-Build-Depends: debhelper-compat (= 13), groff (>= 1.23.0), groff-base, bsdextrautils, bzip2, binutils, clang, clang-tidy, cpp, cppcheck, cpplint, diffoscope, git, iwyu, lzip, man, mandoc, moreutils, pkgconf, xz-utils
+Build-Depends: debhelper-compat (= 13),
+               groff (>= 1.23.0),
+               mandoc,
 Standards-Version: 4.7.0
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/manpages
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/manpages
@@ -18,10 +20,14 @@ Rules-Requires-Root: no
 Package: manpages
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
-Suggests: man-browser
-Replaces: manpages-dev (<< 5.09-2), inn2-dev (<< 2.6.5-1), initscripts (<< 3.0.0-1)
-Breaks: manpages-dev (<< 5.09-2), inn2-dev (<< 2.6.5-1), initscripts (<< 3.0.0-1)
+Depends: ${misc:Depends},
+Suggests: man-browser,
+Replaces: initscripts (<< 3.0.0-1),
+          inn2-dev (<< 2.6.5-1),
+          manpages-dev (<< 5.09-2),
+Breaks: initscripts (<< 3.0.0-1),
+        inn2-dev (<< 2.6.5-1),
+        manpages-dev (<< 5.09-2),
 Description: Manual pages about using a GNU/Linux system
  This package contains GNU/Linux manual pages for these sections:
   4 = Devices (e.g. hd, sd).
@@ -38,10 +44,15 @@ Description: Manual pages about using a GNU/Linux system
 Package: manpages-dev
 Architecture: all
 Multi-Arch: foreign
-Depends: manpages, ${misc:Depends}
-Suggests: man-browser
-Replaces: inn2-dev (<< 2.7.0-1), manpages (<< 6.7-1)
-Breaks: manpages (<< 6.7-1), inn2-dev (<< 2.7.0-1)
+Depends: manpages,
+         ${misc:Depends},
+Suggests: man-browser,
+Replaces: glibc-doc (<< 2.37-16),
+          inn2-dev (<< 2.7.0-1),
+          manpages (<< 6.7-1),
+Breaks: glibc-doc (<< 2.37-16),
+        inn2-dev (<< 2.7.0-1),
+        manpages (<< 6.7-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/copyright b/debian/copyright
index f9b19be..398bad1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1088,7 +1088,7 @@ License: BSD-2-clause
  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE. 
+ POSSIBILITY OF SUCH DAMAGE.
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
diff --git a/debian/manpages.docs b/debian/manpages.docs
index 7ee5afd..4efc474 100644
--- a/debian/manpages.docs
+++ b/debian/manpages.docs
@@ -1,3 +1,3 @@
 Changes.old
-debian/man-addons.el
 debian/POSIX-MANPAGES
+debian/man-addons.el