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

Proposed by Ross Gammon
Status: Superseded
Proposed branch: ~rosco2/ubuntu/+source/qjackctl:merge-disco
Merge into: ubuntu/+source/qjackctl:debian/sid
Diff against target: 147 lines (+95/-1)
5 files modified
debian/changelog (+42/-0)
debian/control (+2/-1)
debian/patches/00_settings.patch (+29/-0)
debian/patches/90_dbus_setting.patch (+20/-0)
debian/patches/series (+2/-0)
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+359392@code.launchpad.net

This proposal supersedes a proposal from 2018-11-25.

This proposal has been superseded by a proposal from 2018-12-05.

To post a comment you must log in.
Revision history for this message
Nish Aravamudan (nacc) wrote :

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.

Unmerged commits

4bbbbf7... by Ross Gammon

Tidy changelog so it looks neater

8e54092... by Ross Gammon

update-maintainer

0161222... by Ross Gammon

reconstruct-changelog

fccfe7b... by Ross Gammon

merge-changelogs

385da2c... by Ross Gammon

    - Reapply and refresh 90_dbus_setting.patch

6459bc9... by Ross Gammon

    - Reapply and refresh 00_settings.patch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index be678ca..5187b4a 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+qjackctl (0.5.0-1ubuntu1) disco; urgency=medium
7+
8+ * Merge with Debian unstable. Remaining changes:
9+ - Reapply and refresh 00_settings.patch
10+ - Reapply and refresh debian/patches/90_dbus_setting.patch
11+
12+ -- Ross Gammon <rossgammon@debian.org> Sat, 24 Nov 2018 23:49:01 +0100
13+
14 qjackctl (0.5.0-1) unstable; urgency=medium
15
16 * New upstream version 0.5.0
17@@ -13,6 +21,19 @@ qjackctl (0.5.0-1) unstable; urgency=medium
18
19 -- Jaromír Mikeš <mira.mikes@seznam.cz> Sun, 17 Dec 2017 15:42:35 +0100
20
21+qjackctl (0.4.5-1ubuntu1) artful; urgency=medium
22+
23+ * Merge with Debian unstable (LP: #1709796).
24+ * Drop: New upstream minor release.
25+ - Partially fixes issues with systray icon (LP: #1546328).
26+ * Remaining changes:
27+ - Fix and refresh Ubuntu-specific patches to fix FTBFS.
28+ - Refresh 90_dbus_setting.patch.
29+ - Extend 90_dbus_setting.patch to enable JACK D-Bus interface too
30+ (LP: #1567589).
31+
32+ -- Ross Gammon <rossgammon@debian.org> Mon, 21 Aug 2017 23:06:44 +0200
33+
34 qjackctl (0.4.5-1) unstable; urgency=medium
35
36 * New upstream version 0.4.5
37@@ -61,6 +82,27 @@ qjackctl (0.4.2-1) unstable; urgency=medium
38
39 -- Jaromír Mikeš <mira.mikes@seznam.cz> Tue, 14 Jun 2016 20:05:46 +0200
40
41+qjackctl (0.4.2-0ubuntu2) xenial; urgency=medium
42+
43+ * Extend 90_dbus_setting.patch to enable JACK D-Bus interface too
44+ (LP: #1567589).
45+
46+ -- Dmitry Shachnev <mitya57@ubuntu.com> Thu, 07 Apr 2016 23:01:12 +0200
47+
48+qjackctl (0.4.2-0ubuntu1) xenial; urgency=medium
49+
50+ * New upstream minor release.
51+ - Partially fixes issues with systray icon (LP: #1546328).
52+ * Refresh 90_dbus_setting.patch.
53+
54+ -- Dmitry Shachnev <mitya57@ubuntu.com> Wed, 06 Apr 2016 22:38:28 +0200
55+
56+qjackctl (0.4.1-1ubuntu1) xenial; urgency=medium
57+
58+ * Fix and refresh Ubuntu-specific patches to fix FTBFS.
59+
60+ -- Logan Rosen <logan@ubuntu.com> Sun, 08 Nov 2015 05:07:06 -0500
61+
62 qjackctl (0.4.1-1) unstable; urgency=medium
63
64 * Imported Upstream version 0.4.1
65diff --git a/debian/control b/debian/control
66index 4856b37..a01b26b 100644
67--- a/debian/control
68+++ b/debian/control
69@@ -1,7 +1,8 @@
70 Source: qjackctl
71 Section: sound
72 Priority: optional
73-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
74+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
75+XSBC-Original-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
76 Uploaders:
77 Adrian Knoth <adi@drcomp.erfurt.thur.de>,
78 Jaromír Mikeš <mira.mikes@seznam.cz>,
79diff --git a/debian/patches/00_settings.patch b/debian/patches/00_settings.patch
80new file mode 100644
81index 0000000..26a773c
82--- /dev/null
83+++ b/debian/patches/00_settings.patch
84@@ -0,0 +1,29 @@
85+Description: Apply Debian-specific patches.
86+ This patch was modified from the original debian patch.
87+ It changes the default jackd patch to /usr/bin/jackd.
88+ In addition, the preset sample rate is 44100.
89+Origin: Debian
90+Author: Chris J Arges <chris.j.arges@canonical.com>
91+Forwarded: not-needed
92+Last-Update: <2012-06-21>
93+
94+--- qjackctl.orig/src/qjackctlSetup.cpp
95++++ qjackctl/src/qjackctlSetup.cpp
96+@@ -368,7 +368,7 @@
97+ #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
98+ preset.sServerPrefix = m_settings.value("/Server", "jackd -S").toString();
99+ #else
100+- preset.sServerPrefix = m_settings.value("/Server", "jackd").toString();
101++ preset.sServerPrefix = m_settings.value("/Server", "/usr/bin/jackd").toString();
102+ #endif
103+ preset.sServerName = m_settings.value("/ServerName").toString();
104+ preset.bRealtime = m_settings.value("/Realtime", true).toBool();
105+@@ -382,7 +382,7 @@
106+ preset.bIgnoreHW = m_settings.value("/IgnoreHW", false).toBool();
107+ preset.iPriority = m_settings.value("/Priority", 0).toInt();
108+ preset.iFrames = m_settings.value("/Frames", 1024).toInt();
109+- preset.iSampleRate = m_settings.value("/SampleRate", 48000).toInt();
110++ preset.iSampleRate = m_settings.value("/SampleRate", 44100).toInt();
111+ preset.iPeriods = m_settings.value("/Periods", 2).toInt();
112+ preset.iWordLength = m_settings.value("/WordLength", 16).toInt();
113+ preset.iWait = m_settings.value("/Wait", 21333).toInt();
114diff --git a/debian/patches/90_dbus_setting.patch b/debian/patches/90_dbus_setting.patch
115new file mode 100644
116index 0000000..f2911ca
117--- /dev/null
118+++ b/debian/patches/90_dbus_setting.patch
119@@ -0,0 +1,20 @@
120+Description: Enable dbus by default to ease cooperation between JACK and Pulse
121+Author: David Henningsson <david.henningsson@canonical.com>
122+Bug-Ubuntu: https://launchpad.net/bugs/803026
123+---
124+ src/qjackctlSetup.cpp | 2 +-
125+ 1 file changed, 1 insertion(+), 1 deletion(-)
126+
127+--- qjackctl.orig/src/qjackctlSetup.cpp
128++++ qjackctl/src/qjackctlSetup.cpp
129+@@ -126,8 +126,8 @@
130+ sServerConfigName = m_settings.value("/ServerConfigName", ".jackdrc").toString();
131+ bServerConfigTemp = m_settings.value("/ServerConfigTemp", false).toBool();
132+ bAlsaSeqEnabled = m_settings.value("/AlsaSeqEnabled", true).toBool();
133+- bDBusEnabled = m_settings.value("/DBusEnabled", false).toBool();
134+- bJackDBusEnabled = m_settings.value("/JackDBusEnabled", false).toBool();
135++ bDBusEnabled = m_settings.value("/DBusEnabled", true).toBool();
136++ bJackDBusEnabled = m_settings.value("/JackDBusEnabled", true).toBool();
137+ bAliasesEnabled = m_settings.value("/AliasesEnabled", false).toBool();
138+ bAliasesEditing = m_settings.value("/AliasesEditing", false).toBool();
139+ bLeftButtons = m_settings.value("/LeftButtons", true).toBool();
140diff --git a/debian/patches/series b/debian/patches/series
141index 56aa973..ef2378e 100644
142--- a/debian/patches/series
143+++ b/debian/patches/series
144@@ -1 +1,3 @@
145 0001-hardening.patch
146+00_settings.patch
147+90_dbus_setting.patch

Subscribers

People subscribed via source and target branches