Version in base suite: 20200710-14

Base version: bmake_20200710-14
Target version: bmake_20200710-14+deb11u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/b/bmake/bmake_20200710-14.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/b/bmake/bmake_20200710-14+deb11u1.dsc

 changelog |    8 ++++++++
 control   |    1 +
 2 files changed, 9 insertions(+)

diff -Nru bmake-20200710/debian/changelog bmake-20200710/debian/changelog
--- bmake-20200710/debian/changelog	2021-04-02 10:53:47.000000000 +0000
+++ bmake-20200710/debian/changelog	2023-06-30 08:43:33.000000000 +0000
@@ -1,3 +1,11 @@
+bmake (20200710-14+deb11u1) bullseye; urgency=medium
+
+  * Non-maintainer upload.
+  * Add Conflicts: bsdowl (<< 2.2.2-1.2~) for directory vs. symlink conflict.
+    (Closes: #985347)
+
+ -- Andreas Beckmann <anbe@debian.org>  Fri, 30 Jun 2023 10:43:33 +0200
+
 bmake (20200710-14) unstable; urgency=medium
 
   * Remove the bsd.*.mk autodetection now that we actually ship symlinks.
diff -Nru bmake-20200710/debian/control bmake-20200710/debian/control
--- bmake-20200710/debian/control	2021-04-02 10:53:47.000000000 +0000
+++ bmake-20200710/debian/control	2023-06-07 07:50:07.000000000 +0000
@@ -13,6 +13,7 @@
 Multi-Arch: foreign
 Replaces: pmake
 Provides: pmake
+Conflicts: bsdowl (<< 2.2.2-1.2~)
 Breaks: pmake (<< 20200710-2)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: NetBSD make