Run of fresh-snapshots for cantata

Merge these changes:

git pull https://janitor.debian.net/git/cantata fresh-snapshots/main
git pull https://janitor.debian.net/git/cantata fresh-snapshots/pristine-tar
git pull https://janitor.debian.net/git/cantata fresh-snapshots/upstream

Summary

Merged new upstream version: 2.5.0.ds1+git20220302.1.af04723 (was: 2.5.0.ds1).

Diff

Branch: main

diff --git a/README.md b/README.md
index 5ed52ab..2733304 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Cantata
 =======
 
-**NOTE** Cantata is now in a bug-fix only state. Therefore, new features are unlikly to be implemented unless pull requests are submitted. The current release, 2.4.x, is likely to be the last feature release.
+**NOTE** After 10 years, development of Cantata has now ceased, and this repository is read-only. v2.5.0 is the last released version.
 
 ![ScreenShot](screenshots/mainwindow.png)
 
diff --git a/debian/changelog b/debian/changelog
index be0054b..78b5304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cantata (2.5.0.ds1+git20220302.1.af04723-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 28 Mar 2022 01:45:05 -0000
+
 cantata (2.5.0.ds1-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/patches/ebur128-location.patch b/debian/patches/ebur128-location.patch
index a442a2c..c956f61 100644
--- a/debian/patches/ebur128-location.patch
+++ b/debian/patches/ebur128-location.patch
@@ -7,9 +7,11 @@ Description: Fix include location for ebur128 files
 
 Author: Stuart Prescott <stuart@debian.org>
 Forwarded: not sure -- check interaction with cmake rules
---- a/replaygain/ffmpeginput.cpp
-+++ b/replaygain/ffmpeginput.cpp
-@@ -31,7 +31,7 @@
+Index: cantata/replaygain/ffmpeginput.cpp
+===================================================================
+--- cantata.orig/replaygain/ffmpeginput.cpp
++++ cantata/replaygain/ffmpeginput.cpp
+@@ -31,7 +31,7 @@ extern "C" {
  #include <QString>
  #include <QList>
  #include <QByteArray>
@@ -18,9 +20,11 @@ Forwarded: not sure -- check interaction with cmake rules
  #include "ffmpeginput.h"
  
  static QMutex mutex;
---- a/replaygain/mpg123input.cpp
-+++ b/replaygain/mpg123input.cpp
-@@ -18,7 +18,7 @@
+Index: cantata/replaygain/mpg123input.cpp
+===================================================================
+--- cantata.orig/replaygain/mpg123input.cpp
++++ cantata/replaygain/mpg123input.cpp
+@@ -18,7 +18,7 @@ extern "C" {
  #include <QFile>
  #include <QString>
  #include <QByteArray>
@@ -29,8 +33,10 @@ Forwarded: not sure -- check interaction with cmake rules
  #include "mpg123input.h"
  
  struct Mpg123Input::Handle {
---- a/replaygain/trackscanner.h
-+++ b/replaygain/trackscanner.h
+Index: cantata/replaygain/trackscanner.h
+===================================================================
+--- cantata.orig/replaygain/trackscanner.h
++++ cantata/replaygain/trackscanner.h
 @@ -25,7 +25,7 @@
  #define _SCANNER_H_
  
diff --git a/windows/icu/README b/windows/icu/README
new file mode 100644
index 0000000..c88e6ae
--- /dev/null
+++ b/windows/icu/README
@@ -0,0 +1,5 @@
+This is a *much* reduced version of icudt52.dll - which probably only works with
+Qt5.3
+
+It has been downloaded from: http://qlcplus.sourceforge.net/icudt52.dll
+Which was linked from: http://qt-project.org/forums/viewthread/38489
diff --git a/windows/icu/icudt52.dll b/windows/icu/icudt52.dll
new file mode 100644
index 0000000..cd368c8
Binary files /dev/null and b/windows/icu/icudt52.dll differ

Branch: pristine-tar

diff --git a/cantata_2.5.0.ds1+git20220302.1.af04723.orig.tar.gz.delta b/cantata_2.5.0.ds1+git20220302.1.af04723.orig.tar.gz.delta
new file mode 100644
index 0000000..65fd8b6
Binary files /dev/null and b/cantata_2.5.0.ds1+git20220302.1.af04723.orig.tar.gz.delta differ
diff --git a/cantata_2.5.0.ds1+git20220302.1.af04723.orig.tar.gz.id b/cantata_2.5.0.ds1+git20220302.1.af04723.orig.tar.gz.id
new file mode 100644
index 0000000..66eef75
--- /dev/null
+++ b/cantata_2.5.0.ds1+git20220302.1.af04723.orig.tar.gz.id
@@ -0,0 +1 @@
+d5e98f0348fdd3495a4f83c5aa33a805b92e0ae8

Branch: upstream

Tag: upstream/2.5.0.ds1+git20220302.1.af04723
diff --git a/README.md b/README.md
index 5ed52ab..2733304 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Cantata
 =======
 
-**NOTE** Cantata is now in a bug-fix only state. Therefore, new features are unlikly to be implemented unless pull requests are submitted. The current release, 2.4.x, is likely to be the last feature release.
+**NOTE** After 10 years, development of Cantata has now ceased, and this repository is read-only. v2.5.0 is the last released version.
 
 ![ScreenShot](screenshots/mainwindow.png)
 
diff --git a/windows/icu/README b/windows/icu/README
new file mode 100644
index 0000000..c88e6ae
--- /dev/null
+++ b/windows/icu/README
@@ -0,0 +1,5 @@
+This is a *much* reduced version of icudt52.dll - which probably only works with
+Qt5.3
+
+It has been downloaded from: http://qlcplus.sourceforge.net/icudt52.dll
+Which was linked from: http://qt-project.org/forums/viewthread/38489
diff --git a/windows/icu/icudt52.dll b/windows/icu/icudt52.dll
new file mode 100644
index 0000000..cd368c8
Binary files /dev/null and b/windows/icu/icudt52.dll differ

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far.not currently attempting to back off
  • ☒ merge proposals for the package maintainer are currently being rate-limited (open: 1383, max open: 300)
  • ☑ change set 101a040a-de07-4697-995d-f96d3e1539d7 is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots cantata-dbgsymapt install -t fresh-snapshots cantata

Lintian Result

Full worker log Full build log