Cherry-picked upstream version 3.10

* debian/control
  - Bumped debhelper to >= 11.
  - Bumped compat to 11.
  - Bumped Standards to 4.2.1, no changes needed.
  - Use secure homepage uri.
  - Added myself to uploaders.
* debian/rules:
  - Added override_dh_missing.
  - Fixed host OS query.
* Fixed watch file, use secure uri
* Added upstream metadata
* Update debian/copyright

7 files changed, 106 insertions, 47 deletions

diff --git a/debian/changelog b/debian/changelog
index d7c8537..df8dd78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+audacious-plugins (3.10-1) UNRELEASED; urgency=medium
+
+  * Cherry-picked upstream version 3.10
+  * debian/control
+    - Bumped debhelper to >= 11.
+    - Bumped compat to 11.
+    - Bumped Standards to 4.2.1, no changes needed.
+    - Use secure homepage uri.
+    - Added myself to uploaders.
+  * debian/rules:
+    - Added override_dh_missing.
+    - Fixed host OS query.
+  * Fixed watch file, use secure uri
+  * Added upstream metadata
+  * Update debian/copyright
+
+ -- Alf Gaida <agaida@siduction.org>  Fri, 02 Nov 2018 20:45:59 +0100
+
 audacious-plugins (3.9-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 2c50722..8d9ab61 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,11 @@ Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
 Uploaders:
  Chris Taylor <ctaylor@debian.org>,
  Bilal Akhtar <bilalakhtar@ubuntu.com>,
- Cyril Lavier <cyril.lavier@davromaniak.eu>
+ Cyril Lavier <cyril.lavier@davromaniak.eu>,
+ Alf Gaida <agaida@siduction.org>
 Build-Depends:
  audacious-dev (>= 3.8),
- debhelper (>= 10),
+ debhelper (>= 11),
  libasound2-dev (>= 1.0) [linux-any],
  libavcodec-dev (>= 4:0.6.1),
  libavformat-dev (>= 4:0.6.1),
@@ -47,8 +48,8 @@ Build-Depends:
  libxcomposite-dev,
  libxml2-dev,
  oss4-dev [!linux-any]
-Standards-Version: 4.1.0
-Homepage: http://www.audacious-media-player.org/
+Standards-Version: 4.2.1
+Homepage: https://www.audacious-media-player.org/
 Vcs-Browser: https://salsa.debian.org/multimedia-team/audacious-plugins
 Vcs-Git: https://salsa.debian.org/multimedia-team/audacious-plugins.git
 
@@ -60,7 +61,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
- audacious (>= 3.9)
+ audacious (>= 3.10)
 Breaks:
  audacious (<< 3.9)
 Description: Base plugins for audacious
diff --git a/debian/copyright b/debian/copyright
index bc1e4d0..2426acd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,39 +1,63 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: audacious-plugins
-Source: http://www.audacious-media-player.org/
+Source: https://www.audacious-media-player.org/
 
 Files: *
 Copyright: 2001-2015 Audacious development team
-           2007-2008 R. Belmont and Richard Bannister
-           2000-2008 Richard F. Bannister
+         2007-2008 R. Belmont and Richard Bannister
+         2017-2018, René J.V. Bertin
+         2000-2008 Richard F. Bannister
+         2015-2016, Róbert Čerňanský
+         2015-2016, Róbert Čerňanský and John Lindgren
+         2007-2008, Sascha Hlusiak <contact@saschahlusiak.de>
+         2006, 2014, William Pitcock <nenolod@nenolod.net>
 License: BSD-3-clause
 
-Files: src/adplug/core/adl.cc
-       src/alarm/*
-       src/aosd/*
-       src/blur_scope/*
-       src/bs2b/*
-       src/cd-menu-items/*
-       src/cue/*
-       src/ffaudio/*
-       src/filewriter/*
-       src/gio/*
-       src/gnomeshortcuts/*
-       src/hotkey/*
-       src/m3u/*
-       src/metronom/*
-       src/mms/*
-       src/neon/*
-       src/pls/*
-       src/psf/peops*/*
-       src/sid/*
-       src/sndfile/*
-       src/statusicon/*
-       src/tonegen/*
-       src/vorbis/*
-       src/vtx/*
+Files: src/alarm/*
+     src/amidiplug/amidi-plug.cc
+     src/amidiplug/backend-fluidsynth/*
+     src/amidiplug/i_backend.h
+     src/amidiplug/i_configure-fluidsynth.cc
+     src/amidiplug/i_configure-fluidsynth.h
+     src/amidiplug/i_configure.cc
+     src/amidiplug/i_configure.h
+     src/amidiplug/i_fileinfo.cc
+     src/amidiplug/i_fileinfo.h
+     src/amidiplug/i_midi.cc
+     src/amidiplug/i_midi.h
+     src/amidiplug/i_midievent.h
+     src/aosd/*
+     src/blur_scope/*
+     src/bs2b/*
+     src/cd-menu-items/*
+     src/cue/*
+     src/ffaudio/*
+     src/filewriter/*
+     src/flac/flacng.h
+     src/flac/plugin.cc
+     src/flac/seekable_stream_callbacks.cc
+     src/flac/tools.cc
+     src/gio/*
+     src/glspectrum/gl-spectrum.cc
+     src/hotkey/*
+     src/lirc/*
+     src/m3u/*
+     src/metronom/*
+     src/mms/*
+     src/neon/*
+     src/pls/*
+     src/psf/peops/*
+     src/psf/peops2/*
+     src/pulse/pulse_audio.cc
+     src/qtglspectrum/gl-spectrum.cc
+     src/sid/*
+     src/sndfile/*
+     src/statusicon/*
+     src/tonegen/*
+     src/vorbis/*
+     src/vtx/*
        src/xsf/desmume/*
-       src/xspf/*
+     src/xspf/*
 Copyright: 2010-2011, Michał Lipski <tallica@o2.pl>
            2009, Tony Vroon <chainsaw@gentoo.org>
            2009, Sebastian Pipping <sebastian@pipping.org>
@@ -94,14 +118,19 @@ Files: src/alsa/*
        src/audpl/*
        src/compressor/*
        src/crossfade/*
-       src/ladspa/*
+       src/ladspa/Makefile
+       src/ladspa/effect.cc
+       src/ladspa/loaded-list.cc
+       src/ladspa/plugin-list.cc
+       src/ladspa/plugin.cc
+       src/ladspa/plugin.h
        src/mixer/*
        src/mpris2/*
        src/oss4/*
        src/resample/*
        src/sdlout/*
-Copyright: 2010-2011,2013 Michał Lipski <tallica@o2.pl>
-           2009-2012 John Lindgren
+Copyright: 2009-2016, John Lindgren
+         2010-2013, Michał Lipski <tallica@o2.pl>
 License: BSD-2-clause
 
 Files: src/asx/*
@@ -114,16 +143,18 @@ Copyright: 2011-2012 John Lindgren
 License: BSD-2-clause
 
 Files: src/albumart/*
+       src/aosd/ghosd*
        src/cairo-spectrum/*
        src/crystalizer/*
        src/voice_removal/*
-       src/aosd/ghosd*
        src/mpg123/*
        src/lyricwiki/*
-Copyright: 2010-2011 John Lindgren <john.lindgren@tds.net>
-           2007-2011 William Pitcock <nenolod@dereferenced.org>
-           2006 Evan Martin
-           2005 Shay Green
+Copyright: 2010-2013, John Lindgren <john.lindgren@tds.net>
+         2007-2011, William Pitcock <nenolod@dereferenced.org>
+         2007, Giacomo Lozito <james@develia.org>
+	 2006, Evan Martin <martine@danga.com>
+         2005, Shay Green
+         1994, X Consortium
 License: Expat
 
 Files: src/notify/*
diff --git a/debian/rules b/debian/rules
index 9f41c45..34c0cf7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,16 @@
 #!/usr/bin/make -f
 
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-ifeq ($(DEB_BUILD_ARCH),i386)
+ifeq ($(BUILD_ARCH),i386)
 additional_confflags := --disable-sse2
 endif
 
-ifeq ($(DEB_BUILD_ARCH),armel)
+ifeq ($(BUILD_ARCH),armel)
 additional_confflags := --disable-qtglspectrum
 endif
 
-ifeq ($(DEB_BUILD_ARCH),armhf)
+ifeq ($(BUILD_ARCH),armhf)
 additional_confflags := --disable-qtglspectrum
 endif
 
@@ -26,3 +26,7 @@ override_dh_auto_configure:
 
 override_dh_auto_clean:
 	dh_auto_clean || true
+
+
+override_dh_missing:
+	dh_missing --fail-missing
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..2ec8883
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+Name: audacious-plugins
+Bug-Database: https://redmine.audacious-media-player.org/projects/audacious/issues
+Changelog: https://github.com/audacious-media-player/audacious-plugins/commits/master
+Repository: https://github.com/audacious-media-player/audacious-plugins
+Repository-Browse: https://github.com/audacious-media-player/audacious-plugins
diff --git a/debian/watch b/debian/watch
index 43d567a..c86458d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=4
-http://distfiles.audacious-media-player.org/audacious-plugins-([^-]*)\.tar\.bz2
+https://distfiles.audacious-media-player.org/audacious-plugins-([^-]*)\.tar\.bz2