Record audacious (4.0.5-2) in archive suite sid

10 files changed, 59 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index f3aefb1..1898aed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+audacious (4.0.5-2) unstable; urgency=medium
+
+  [ Jelmer Vernooij ]
+  * Set upstream Repository/Repository-Browse fields.
+
+  [ Mateusz Łukasik ]
+  * Merge requests for salsa:
+    - Describe Qt and GTK options in audacious manpage
+    - Fix some issues reported by lintian
+  * d/control:
+    - Bump Standards-Version to 4.6.0.
+    - Bump dh version to 13.
+  * Update symbols files - fix FTBFS with gcc-11. (Closes: #983974)
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl>  Wed, 13 Oct 2021 21:45:42 +0200
+
 audacious (4.0.5-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 5982c2d..4362818 100644
--- a/debian/control
+++ b/debian/control
@@ -6,14 +6,14 @@ Uploaders:
  Andrej Shadura <andrewsh@debian.org>,
  Mateusz Łukasik <mati75@linuxmint.pl>
 Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  imagemagick,
  libglib2.0-dev,
  libgtk2.0-dev,
  librsvg2-bin,
  qtbase5-dev
-Standards-Version: 4.5.0
-Homepage: http://www.audacious-media-player.org/
+Standards-Version: 4.6.0
+Homepage: https://www.audacious-media-player.org/
 Vcs-Browser: https://salsa.debian.org/multimedia-team/audacious
 Vcs-Git: https://salsa.debian.org/multimedia-team/audacious.git
 
diff --git a/debian/libaudcore5.symbols b/debian/libaudcore5.symbols
index 5659319..4bb8a01 100644
--- a/debian/libaudcore5.symbols
+++ b/debian/libaudcore5.symbols
@@ -18,6 +18,9 @@ libaudcore.so.5 libaudcore5 #MINVER#
  (c++)"str_tolower(char const*)@Base" 3.8
  (c++)"str_toupper(char const*)@Base" 3.9
  (c++|regex)"^str_vprintf\(char const\*, (__va_list_tag\*?|char\*|std::__va_list|void\*)\)@Base$" 3.9
+ (c++|optional)"std::unique_lock<std::mutex>::unlock()@Base" 4.0.5
+ (c++|optional)"std::_Function_base::~_Function_base()@Base" 4.0.5
+ (c++|optional|regex)"std::once_flag::.*@Base" 4.0.5
  (c++)"strcmp_safe(char const*, char const*, int)@Base" 3.8
  (c++)"tiny_unlock(char*)@Base" 3.8
  (c++)"aud_art_data(AudArtItem const*)@Base" 3.9
@@ -441,4 +444,3 @@ libaudcore.so.5 libaudcore5 #MINVER#
  (c++)"typeinfo name for std::thread::_State_impl<std::thread::_Invoker<std::tuple<void (*)()> > >@Base" 4.0
  (c++)"vtable for std::thread::_State_impl<std::thread::_Invoker<std::tuple<void (*)(QueuedData*), QueuedData*> > >@Base" 4.0
  (c++)"vtable for std::thread::_State_impl<std::thread::_Invoker<std::tuple<void (*)()> > >@Base" 4.0
- (c++)"std::call_once<void (&)()>(std::once_flag&, void (&)())::{lambda()#2}::_FUN()@Base" 4.0
diff --git a/debian/libaudgui5.symbols b/debian/libaudgui5.symbols
index e6ff931..d1c8497 100644
--- a/debian/libaudgui5.symbols
+++ b/debian/libaudgui5.symbols
@@ -75,3 +75,4 @@ libaudgui.so.5 libaudgui5 #MINVER#
  (c++)"audgui_menu_item_new_with_domain(AudguiMenuItem const*, _GtkAccelGroup*, char const*)@Base" 3.8
  (c++)"audgui_show_prefs_for_plugin_type(PluginType)@Base" 3.8
  (c++)"audgui_urilist_create_from_selected(Playlist)@Base" 3.9
+ images_get_resource@Base 4.0.5
diff --git a/debian/patches/qt-option-man.patch b/debian/patches/qt-option-man.patch
new file mode 100644
index 0000000..d15cf78
--- /dev/null
+++ b/debian/patches/qt-option-man.patch
@@ -0,0 +1,25 @@
+From: Jonathan Rubenstein <jrubcop@gmail.com>
+Date: Sun, 26 Apr 2020 14:28:27 -0400
+Subject: Describe Qt and GTK options in audacious manpage
+
+---
+ man/audacious.1.in | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/man/audacious.1.in b/man/audacious.1.in
+index aceaa51..cefa1ac 100644
+--- a/man/audacious.1.in
++++ b/man/audacious.1.in
+@@ -77,6 +77,12 @@ Print debugging output while running (may be used twice for even more output).
+ .B -N, --new-instance
+ Starts a new instance.  The second instance started may be controlled with
+ \fBaudtool -2\fR, the third with \fBaudtool -3\fR, etc. (up to 9 instances).
++.TP
++.B -G, --gtk
++Start Audacious using the GTK+ interface.
++.TP
++.B -Q, --qt
++Start Audacious using the Qt interface.
+ 
+ .SH KEYBINDINGS
+ .ta 24
diff --git a/debian/patches/series b/debian/patches/series
index 258db70..2164759 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 add-keywords.patch
 default-to-gtk.patch
+qt-option-man.patch
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 1ae9fc7..a705454 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,5 +1,5 @@
 # this is not relevant to us
-source: source-contains-unsafe-symlink contrib/macpack/Audacious.app/Contents/MacOS/audacious
+source: wayward-symbolic-link-target-in-source contrib/macpack/Audacious.app/Contents/MacOS/audacious
 
 # the upstream always releases plugins and the core in sync
 source: version-substvar-for-external-package audacious -> audacious-plugins
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..87763fe
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,2 @@
+Repository: https://github.com/audacious-media-player/audacious.git
+Repository-Browse: https://github.com/audacious-media-player/audacious
diff --git a/debian/watch b/debian/watch
index 99f780a..a3ddaea 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=4
-http://distfiles.audacious-media-player.org/audacious-([^-]*)\.tar\.bz2
+https://distfiles.audacious-media-player.org/audacious-([^-]*)\.tar\.bz2
diff --git a/man/audacious.1.in b/man/audacious.1.in
index aceaa51..cefa1ac 100644
--- a/man/audacious.1.in
+++ b/man/audacious.1.in
@@ -77,6 +77,12 @@ Print debugging output while running (may be used twice for even more output).
 .B -N, --new-instance
 Starts a new instance.  The second instance started may be controlled with
 \fBaudtool -2\fR, the third with \fBaudtool -3\fR, etc. (up to 9 instances).
+.TP
+.B -G, --gtk
+Start Audacious using the GTK+ interface.
+.TP
+.B -Q, --qt
+Start Audacious using the Qt interface.
 
 .SH KEYBINDINGS
 .ta 24