[SCM] qjackctl/master: Delete unused ubuntu patches.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Sun Dec 17 14:47:20 UTC 2017


The following commit has been merged in the master branch:
commit 77d9fa3bca5c64307e005de12eaa52448ae2fbea
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Dec 16 23:19:11 2017 +0100

    Delete unused ubuntu patches.

diff --git a/debian/patches/00_settings.patch b/debian/patches/00_settings.patch
deleted file mode 100644
index 7c851c5..0000000
--- a/debian/patches/00_settings.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 <chris.j.arges at canonical.com>
-Forwarded: not-needed
-Last-Update: <2012-06-21>
-
---- qjackctl-0.3.9.orig/src/qjackctlSetup.cpp
-+++ qjackctl-0.3.9/src/qjackctlSetup.cpp
-@@ -345,7 +345,7 @@ bool qjackctlSetup::loadPreset ( qjackct
- 	}
- 
- 	m_settings.beginGroup("/Settings" + sSuffix);
--	preset.sServerPrefix = m_settings.value("/Server", "jackd").toString();
-+	preset.sServerPrefix = m_settings.value("/Server", "/usr/bin/jackd").toString();
- 	preset.sServerName  = m_settings.value("/ServerName").toString();
- 	preset.bRealtime    = m_settings.value("/Realtime", true).toBool();
- 	preset.bSoftMode    = m_settings.value("/SoftMode", false).toBool();
-@@ -358,7 +358,7 @@ bool qjackctlSetup::loadPreset ( qjackct
- 	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
deleted file mode 100644
index 8eb5ba0..0000000
--- a/debian/patches/90_dbus_setting.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Enable dbus by default to ease cooperation between JACK and Pulse
-Author: David Henningsson <david.henningsson at canonical.com>
-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
-@@ -108,7 +108,7 @@ void qjackctlSetup::loadSetup (void)
- 	bServerConfigTemp        = m_settings.value("/ServerConfigTemp", false).toBool();
- 	bQueryShutdown           = m_settings.value("/QueryShutdown", true).toBool();
- 	bAlsaSeqEnabled          = m_settings.value("/AlsaSeqEnabled", true).toBool();
--	bDBusEnabled             = m_settings.value("/DBusEnabled", false).toBool();
-+	bDBusEnabled             = m_settings.value("/DBusEnabled", 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/ubuntu.series b/debian/patches/ubuntu.series
deleted file mode 100644
index 89be1e3..0000000
--- a/debian/patches/ubuntu.series
+++ /dev/null
@@ -1,2 +0,0 @@
-00_settings.patch
-90_dbus_setting.patch

-- 
qjackctl packaging



More information about the pkg-multimedia-commits mailing list