diff -Nru fcm-2019.09.0/debian/changelog fcm-2019.09.0/debian/changelog --- fcm-2019.09.0/debian/changelog 2019-10-02 18:10:43.000000000 +0000 +++ fcm-2019.09.0/debian/changelog 2020-01-15 09:39:12.000000000 +0000 @@ -1,3 +1,11 @@ +fcm (2019.09.0-2) unstable; urgency=medium + + * Switch from using xxdiff to kdiff3 as graphical merge tool, + as xxdiff depends on python2 which is being removed + * Standards-Version: 4.4.1 + + -- Alastair McKinstry Wed, 15 Jan 2020 09:39:12 +0000 + fcm (2019.09.0-1) unstable; urgency=medium * New upstream release diff -Nru fcm-2019.09.0/debian/control fcm-2019.09.0/debian/control --- fcm-2019.09.0/debian/control 2019-10-02 18:10:43.000000000 +0000 +++ fcm-2019.09.0/debian/control 2020-01-15 09:39:12.000000000 +0000 @@ -2,7 +2,7 @@ Section: utils Priority: optional Maintainer: Alastair McKinstry -Standards-Version: 4.4.0 +Standards-Version: 4.4.1.0 Build-Depends: debhelper-compat (= 12), libconfig-ini-perl, libclass-dbi-sqlite-perl, @@ -10,7 +10,7 @@ libsvn-perl, perl-tk, subversion, - xxdiff, + kdiff3, rsync Homepage: https://beta.metoffice.gov.uk/research/weather/weather-science-it/fcm Vcs-Browser: https://salsa.debian.org:/science-team/fcm.git @@ -18,7 +18,7 @@ Package: fcm Architecture: all -Depends: xxdiff, ${perl:Depends}, ${misc:Depends}, libjs-jquery, +Depends: kdiff3, ${perl:Depends}, ${misc:Depends}, libjs-jquery, libconfig-inifiles-perl, libclass-dbi-sqlite-perl, libxml-parser-perl, libsvn-perl, subversion, perl-tk Description: Flexible Configuration Manager