From 80ebb54b9dbc00fad474b273110c44b88a7909c2 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann <anbe@debian.org> Date: Sat, 27 Apr 2024 21:08:49 +0200 Subject: [PATCH] Import Debian changes 0.99.30-4.1 software-properties (0.99.30-4.1) unstable; urgency=medium . * Non-maintainer upload. * software-properties-qt: Add Conflicts+Replaces: software-properties-kde for smoother upgrades from bullseye. (Closes: #1034993) --- .bzr-builddeb/default.conf | 3 +++ debian/changelog | 8 ++++++++ debian/control | 2 ++ 3 files changed, 13 insertions(+) create mode 100644 .bzr-builddeb/default.conf diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf new file mode 100644 index 00000000..be0e4c16 --- /dev/null +++ b/.bzr-builddeb/default.conf @@ -0,0 +1,3 @@ +[BUILDDEB] +native = True + diff --git a/debian/changelog b/debian/changelog index 8c9ea885..92415036 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +software-properties (0.99.30-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * software-properties-qt: Add Conflicts+Replaces: software-properties-kde + for smoother upgrades from bullseye. (Closes: #1034993) + + -- Andreas Beckmann <anbe@debian.org> Sat, 27 Apr 2024 21:08:49 +0200 + software-properties (0.99.30-4) unstable; urgency=medium * py3-software-properties: Depend on lazr.restfulclient (Closes: #1029047) diff --git a/debian/control b/debian/control index 94d20bd7..790eaae4 100644 --- a/debian/control +++ b/debian/control @@ -109,6 +109,8 @@ Depends: debconf-kde-helper, ${misc:Depends}, ${python3:Depends} Suggests: plasma-discover +Conflicts: software-properties-kde +Replaces: software-properties-kde Description: manage the repositories that you install software from (Qt) This software provides an abstraction of the used apt repositories. It allows you to easily manage your distribution and independent software -- GitLab