[SCM] qjackctl packaging branch, master, updated. debian/0.3.6-1-2-g93d3545

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 93d3545690f6cb094db4d3e3474438b3264c93f3
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Aug 22 12:03:42 2010 +0200

    Switch to 3.0 (quilt) format, refresh and update patches.

diff --git a/debian/patches/00_settings.patch b/debian/patches/00_settings.patch
index 3624f3a..1158aaf 100644
--- a/debian/patches/00_settings.patch
+++ b/debian/patches/00_settings.patch
@@ -1,8 +1,10 @@
-diff --git a/src/qjackctlSetup.cpp b/src/qjackctlSetup.cpp
-index 57b9cbc..99df4a1 100644
---- a/src/qjackctlSetup.cpp
-+++ b/src/qjackctlSetup.cpp
-@@ -291,7 +291,7 @@ bool qjackctlSetup::loadPreset ( qjackctlPreset& preset, const QString& sPreset
+---
+ src/qjackctlSetup.cpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- qjackctl.orig/src/qjackctlSetup.cpp
++++ qjackctl/src/qjackctlSetup.cpp
+@@ -313,7 +313,7 @@ bool qjackctlSetup::loadPreset ( qjackct
  	}
  
  	m_settings.beginGroup("/Settings" + sSuffix);
@@ -11,7 +13,7 @@ index 57b9cbc..99df4a1 100644
  	preset.bRealtime    = m_settings.value("/Realtime", true).toBool();
  	preset.bSoftMode    = m_settings.value("/SoftMode", false).toBool();
  	preset.bMonitor     = m_settings.value("/Monitor", false).toBool();
-@@ -303,7 +303,7 @@ bool qjackctlSetup::loadPreset ( qjackctlPreset& preset, const QString& sPreset
+@@ -325,7 +325,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();
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a655f7e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+00_settings.patch
diff --git a/debian/rules b/debian/rules
index ca00657..39018e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 CFLAGS = -Wall -g
 export QTDIR=/usr/share/qt4
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
qjackctl packaging