Merge ~rosco2/ubuntu/+source/qjackctl:merge-disco-0.5.0-1ubuntu1 into ubuntu/+source/qjackctl:debian/sid

[Ross Gammon]

Amended the last commit to mention the relevant bug for the 90_dbus_setting.patch, for future reference.

[Nish Aravamudan (nacc)]

I think this looks good overall. The delta that was present before is carried forward accurately. I think the only nit I have is if you could put a (LP #1567589) [note, no colon] with the second change in the changelog and the commit message, so that we carry the bug attribution forward. That way, if a user or developer later wonders what this bit of delta is doing, they can quickly see it in the topmost entry, rather than having to do archaeology to find the bug number.

[Nish Aravamudan (nacc)]

I think you lost a newline before your signature :)

Unmerged commits

483e7e4... by Ross Gammon on 2018-11-24

Tidy changelog so it looks neater

Add reference to original bug for 90_dbus_setting.patch:
(LP #1567589)

8e54092... by Ross Gammon on 2018-11-24

update-maintainer

0161222... by Ross Gammon on 2018-11-24

reconstruct-changelog

fccfe7b... by Ross Gammon on 2018-11-24

merge-changelogs

385da2c... by Ross Gammon on 2018-11-24

    - Reapply and refresh 90_dbus_setting.patch

6459bc9... by Ross Gammon on 2018-11-24

    - Reapply and refresh 00_settings.patch

diff --git a/debian/changelog b/debian/changelog
index be678ca..e67067f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qjackctl (0.5.0-1ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Reapply and refresh 00_settings.patch
+    - Reapply and refresh debian/patches/90_dbus_setting.patch
+      (LP #1567589)
+ -- Ross Gammon <[e-mail]>  Sat, 24 Nov 2018 23:49:01 +0100
+
 qjackctl (0.5.0-1) unstable; urgency=medium
 
   * New upstream version 0.5.0
@@ -13,6 +21,19 @@ qjackctl (0.5.0-1) unstable; urgency=medium
 
  -- Jaromír Mikeš <[e-mail]>  Sun, 17 Dec 2017 15:42:35 +0100
 
+qjackctl (0.4.5-1ubuntu1) artful; urgency=medium
+
+  * Merge with Debian unstable (LP: #1709796).
+  * Drop: New upstream minor release.
+    - Partially fixes issues with systray icon (LP: #1546328).
+  * Remaining changes:
+    - Fix and refresh Ubuntu-specific patches to fix FTBFS.
+    - Refresh 90_dbus_setting.patch.
+    - Extend 90_dbus_setting.patch to enable JACK D-Bus interface too
+      (LP: #1567589).
+
+ -- Ross Gammon <[e-mail]>  Mon, 21 Aug 2017 23:06:44 +0200
+
 qjackctl (0.4.5-1) unstable; urgency=medium
 
   * New upstream version 0.4.5
@@ -61,6 +82,27 @@ qjackctl (0.4.2-1) unstable; urgency=medium
 
  -- Jaromír Mikeš <[e-mail]>  Tue, 14 Jun 2016 20:05:46 +0200
 
+qjackctl (0.4.2-0ubuntu2) xenial; urgency=medium
+
+  * Extend 90_dbus_setting.patch to enable JACK D-Bus interface too
+    (LP: #1567589).
+
+ -- Dmitry Shachnev <[e-mail]>  Thu, 07 Apr 2016 23:01:12 +0200
+
+qjackctl (0.4.2-0ubuntu1) xenial; urgency=medium
+
+  * New upstream minor release.
+    - Partially fixes issues with systray icon (LP: #1546328).
+  * Refresh 90_dbus_setting.patch.
+
+ -- Dmitry Shachnev <[e-mail]>  Wed, 06 Apr 2016 22:38:28 +0200
+
+qjackctl (0.4.1-1ubuntu1) xenial; urgency=medium
+
+  * Fix and refresh Ubuntu-specific patches to fix FTBFS.
+
+ -- Logan Rosen <[e-mail]>  Sun, 08 Nov 2015 05:07:06 -0500
+
 qjackctl (0.4.1-1) unstable; urgency=medium
 
   * Imported Upstream version 0.4.1
diff --git a/debian/control b/debian/control
index 4856b37..a01b26b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: qjackctl
 Section: sound
 Priority: optional
-Maintainer: Debian Multimedia Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Multimedia Maintainers <[e-mail]>
 Uploaders:
  Adrian Knoth <[e-mail]>,
  Jaromír Mikeš <[e-mail]>,
diff --git a/debian/patches/00_settings.patch b/debian/patches/00_settings.patch
 new file mode 100644
index 0000000..26a773c
--- /dev/null
+++ b/debian/patches/00_settings.patch
@@ -0,0 +1,29 @@
+Description: Apply Debian-specific patches.
+  This patch was modified from the original debian patch. 
+  It changes the default jackd patch to /usr/bin/jackd.
+  In addition, the preset sample rate is 44100.
+Origin: Debian
+Author: Chris J Arges <[e-mail]>
+Forwarded: not-needed
+Last-Update: <2012-06-21>
+
+--- qjackctl.orig/src/qjackctlSetup.cpp
++++ qjackctl/src/qjackctlSetup.cpp
+@@ -368,7 +368,7 @@
+ #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
+ 	preset.sServerPrefix = m_settings.value("/Server", "jackd -S").toString();
+ #else
+-	preset.sServerPrefix = m_settings.value("/Server", "jackd").toString();
++	preset.sServerPrefix = m_settings.value("/Server", "/usr/bin/jackd").toString();
+ #endif
+ 	preset.sServerName  = m_settings.value("/ServerName").toString();
+ 	preset.bRealtime    = m_settings.value("/Realtime", true).toBool();
+@@ -382,7 +382,7 @@
+ 	preset.bIgnoreHW    = m_settings.value("/IgnoreHW", false).toBool();
+ 	preset.iPriority    = m_settings.value("/Priority", 0).toInt();
+ 	preset.iFrames      = m_settings.value("/Frames", 1024).toInt();
+-	preset.iSampleRate  = m_settings.value("/SampleRate", 48000).toInt();
++	preset.iSampleRate  = m_settings.value("/SampleRate", 44100).toInt();
+ 	preset.iPeriods     = m_settings.value("/Periods", 2).toInt();
+ 	preset.iWordLength  = m_settings.value("/WordLength", 16).toInt();
+ 	preset.iWait        = m_settings.value("/Wait", 21333).toInt();
diff --git a/debian/patches/90_dbus_setting.patch b/debian/patches/90_dbus_setting.patch
 new file mode 100644
index 0000000..f2911ca
--- /dev/null
+++ b/debian/patches/90_dbus_setting.patch
@@ -0,0 +1,20 @@
+Description: Enable dbus by default to ease cooperation between JACK and Pulse
+Author: David Henningsson <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/803026
+---
+ src/qjackctlSetup.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- qjackctl.orig/src/qjackctlSetup.cpp
++++ qjackctl/src/qjackctlSetup.cpp
+@@ -126,8 +126,8 @@
+ 	sServerConfigName        = m_settings.value("/ServerConfigName", ".jackdrc").toString();
+ 	bServerConfigTemp        = m_settings.value("/ServerConfigTemp", false).toBool();
+ 	bAlsaSeqEnabled          = m_settings.value("/AlsaSeqEnabled", true).toBool();
+-	bDBusEnabled             = m_settings.value("/DBusEnabled", false).toBool();
+-	bJackDBusEnabled         = m_settings.value("/JackDBusEnabled", false).toBool();
++	bDBusEnabled             = m_settings.value("/DBusEnabled", true).toBool();
++	bJackDBusEnabled         = m_settings.value("/JackDBusEnabled", true).toBool();
+ 	bAliasesEnabled          = m_settings.value("/AliasesEnabled", false).toBool();
+ 	bAliasesEditing          = m_settings.value("/AliasesEditing", false).toBool();
+ 	bLeftButtons             = m_settings.value("/LeftButtons", true).toBool();
diff --git a/debian/patches/series b/debian/patches/series
index 56aa973..ef2378e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-hardening.patch
+00_settings.patch
+90_dbus_setting.patch