Run of scrub-obsolete for kdiff3
Merge these changes:
git pull https://janitor.debian.net/git/kdiff3 scrub-obsolete/main
Summary
Scrub obsolete dependencies and constraints.Diff
diff --git a/debian/changelog b/debian/changelog
index 20d28bc..d7078b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+kdiff3 (1.10.0-2) UNRELEASED; urgency=medium
+
+ * Remove constraints unnecessary since buster (oldstable):
+ + Build-Depends: Drop versioned constraint on extra-cmake-modules (>=
+ 5.50.0~).
+ + Build-Depends: Drop versioned constraint on libkf5config-dev (>= 5.50.0~).
+ + Build-Depends: Drop versioned constraint on libkf5coreaddons-dev (>=
+ 5.50.0~).
+ + Build-Depends: Drop versioned constraint on libkf5crash-dev (>= 5.50.0~).
+ + Build-Depends: Drop versioned constraint on libkf5doctools-dev (>=
+ 5.50.0~).
+ + Build-Depends: Drop versioned constraint on libkf5i18n-dev (>= 5.50.0~).
+ + Build-Depends: Drop versioned constraint on libkf5kio-dev (>= 5.50.0~).
+ + Build-Depends: Drop versioned constraint on libkf5parts-dev (>= 5.50.0~).
+ + Build-Depends: Drop versioned constraint on libkf5widgetsaddons-dev (>=
+ 5.50.0~).
+ + kdiff3: Drop conflict with removed package kdiff3-qt (<< 1.0) in Replaces.
+ + kdiff3: Drop conflict with removed package kdiff3-qt (<< 1.0) in Breaks.
+ + kdiff3-doc: Drop conflict with removed package kdiff3 (<= 1.7.90-1) in
+ Replaces.
+ + kdiff3-doc: Drop conflict with removed package kdiff3 (<= 1.7.90-1) in
+ Breaks.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sat, 21 Jan 2023 06:46:38 -0000
+
kdiff3 (1.10.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 5ccfa7d..dcbf49a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,16 +8,16 @@ Build-Depends: debhelper-compat (= 13),
pkg-kde-tools,
gettext,
cmake (>= 3.14~),
- extra-cmake-modules (>= 5.50.0~),
+ extra-cmake-modules,
qtbase5-dev (>= 5.15.2~),
- libkf5config-dev (>= 5.50.0~),
- libkf5coreaddons-dev (>= 5.50.0~),
- libkf5crash-dev (>= 5.50.0~),
- libkf5doctools-dev (>= 5.50.0~),
- libkf5i18n-dev (>= 5.50.0~),
- libkf5kio-dev (>= 5.50.0~),
- libkf5parts-dev (>= 5.50.0~),
- libkf5widgetsaddons-dev (>= 5.50.0~),
+ libkf5config-dev,
+ libkf5coreaddons-dev,
+ libkf5crash-dev,
+ libkf5doctools-dev,
+ libkf5i18n-dev,
+ libkf5kio-dev,
+ libkf5parts-dev,
+ libkf5widgetsaddons-dev,
libboost-dev (>= 1.71.0~),
xauth <!nocheck>,
xvfb <!nocheck>,
@@ -32,8 +32,6 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Recommends: kdiff3-doc
-Breaks: kdiff3-qt (<<1.0)
-Replaces: kdiff3-qt (<<1.0)
Description: compares and merges 2 or 3 files or directories
KDiff3 compares two or three input files and shows the differences
line by line and character by character. It provides an automatic
@@ -58,8 +56,6 @@ Multi-Arch: foreign
Section: doc
Depends: ${misc:Depends}
Recommends: kdiff3
-Breaks: kdiff3 (<= 1.7.90-1)
-Replaces: kdiff3 (<= 1.7.90-1)
Description: documentation for KDiff3
KDiff3 compares two or three input files and shows the differences
line by line and character by character.
Publish History
- 2023-01-21T08:32: Merge proposal updated ( Succesfully updated )
Resulting package
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t scrub-obsolete kdiff3-dbgsymapt install -t scrub-obsolete kdiff3-docapt install -t scrub-obsolete kdiff3-qtapt install -t scrub-obsolete kdiff3
Lintian Result
- kdiff3-dbgsym_1.10.0-2~jan+obs2_amd64.deb
- kdiff3-doc_1.10.0-2~jan+obs2_all.deb
- kdiff3-qt_1.10.0-2~jan+obs2_all.deb
- kdiff3_1.10.0-2~jan+obs2.dsc
- kdiff3_1.10.0-2~jan+obs2_amd64.buildinfo
- kdiff3_1.10.0-2~jan+obs2_amd64.deb
- kdiff3_1.10.0-2~jan+obs2_amd64.changes
Reviews
| Reviewer | Verdict | Comment |
|---|---|---|
| jelmer@debian.org | approved |