[SCM] qjackctl/master: Patches applied upstream.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 545f0af0ca47f51f093b2db9ad9f3345d074ea18
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Sep 19 14:03:58 2016 +0200

    Patches applied upstream.

diff --git a/debian/patches/01-configure-gcc6.patch b/debian/patches/01-configure-gcc6.patch
deleted file mode 100644
index bd13ec7..0000000
--- a/debian/patches/01-configure-gcc6.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix build with gcc6
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
-
-Index: qjackctl/configure.ac
-===================================================================
---- qjackctl.orig/configure.ac
-+++ qjackctl/configure.ac
-@@ -115,7 +115,7 @@ AC_ARG_ENABLE(stacktrace,
- 
- 
- # Standard installation base dirs.
--ac_with_paths="/usr /usr/local"
-+ac_with_paths=""
- 
- # Set for alternate Qt4/5 installation dir.
- AC_ARG_WITH(qt4,
diff --git a/debian/patches/02-spelling.patch b/debian/patches/02-spelling.patch
deleted file mode 100644
index 3f10348..0000000
--- a/debian/patches/02-spelling.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Description: Fix spelling.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: Rui Nuno Capela <rncbc at rncbc.org>
-
-Index: qjackctl/src/qjackctlSetupForm.ui
-===================================================================
---- qjackctl.orig/src/qjackctlSetupForm.ui
-+++ qjackctl/src/qjackctlSetupForm.ui
-@@ -1089,7 +1089,7 @@
-                 </font>
-                </property>
-                <property name="toolTip">
--                <string>Set client timeout limit in miliseconds</string>
-+                <string>Set client timeout limit in milliseconds</string>
-                </property>
-                <property name="editable">
-                 <bool>true</bool>
-Index: qjackctl/src/translations/qjackctl_cs.ts
-===================================================================
---- qjackctl.orig/src/translations/qjackctl_cs.ts
-+++ qjackctl/src/translations/qjackctl_cs.ts
-@@ -2794,7 +2794,7 @@ Jste si jistý, že chcete přepsat stá
-     </message>
-     <message>
-         <location filename="../qjackctlSetupForm.ui" line="1092"/>
--        <source>Set client timeout limit in miliseconds</source>
-+        <source>Set client timeout limit in milliseconds</source>
-         <translation>Nastavit mez pro překročení času u klienta; údaj v milisekundách</translation>
-     </message>
-     <message>
-Index: qjackctl/src/translations/qjackctl_de.ts
-===================================================================
---- qjackctl.orig/src/translations/qjackctl_de.ts
-+++ qjackctl/src/translations/qjackctl_de.ts
-@@ -2763,7 +2763,7 @@ Soll das existierende Verzeichnis übers
-     </message>
-     <message>
-         <location filename="../qjackctlSetupForm.ui" line="1092"/>
--        <source>Set client timeout limit in miliseconds</source>
-+        <source>Set client timeout limit in milliseconds</source>
-         <translation>Timeout-Limitierung für Clients festlegen; Angabe in Millisekunden</translation>
-     </message>
-     <message>
-Index: qjackctl/src/translations/qjackctl_es.ts
-===================================================================
---- qjackctl.orig/src/translations/qjackctl_es.ts
-+++ qjackctl/src/translations/qjackctl_es.ts
-@@ -2490,7 +2490,7 @@ Está seguro de sobreescribir esta carpe
-     </message>
-     <message>
-         <location filename="../qjackctlSetupForm.ui" line="1092"/>
--        <source>Set client timeout limit in miliseconds</source>
-+        <source>Set client timeout limit in milliseconds</source>
-         <translation>Establece el límite de tiempo de los clientes en milisegundos</translation>
-     </message>
-     <message>
-Index: qjackctl/src/translations/qjackctl_fr.ts
-===================================================================
---- qjackctl.orig/src/translations/qjackctl_fr.ts
-+++ qjackctl/src/translations/qjackctl_fr.ts
-@@ -2515,7 +2515,7 @@ Are you sure to overwrite the existing f
-     </message>
-     <message>
-         <location filename="../qjackctlSetupForm.ui" line="1092"/>
--        <source>Set client timeout limit in miliseconds</source>
-+        <source>Set client timeout limit in milliseconds</source>
-         <translation>Régler le limite du décompte client en millisecondes</translation>
-     </message>
-     <message>
-Index: qjackctl/src/translations/qjackctl_it.ts
-===================================================================
---- qjackctl.orig/src/translations/qjackctl_it.ts
-+++ qjackctl/src/translations/qjackctl_it.ts
-@@ -2515,7 +2515,7 @@ Sovrascrivo la cartella?</translation>
-     </message>
-     <message>
-         <location filename="../qjackctlSetupForm.ui" line="1092"/>
--        <source>Set client timeout limit in miliseconds</source>
-+        <source>Set client timeout limit in milliseconds</source>
-         <translation>Imposta il limite di tempo di attesa per il client, in msec</translation>
-     </message>
-     <message>
-Index: qjackctl/src/translations/qjackctl_ja.ts
-===================================================================
---- qjackctl.orig/src/translations/qjackctl_ja.ts
-+++ qjackctl/src/translations/qjackctl_ja.ts
-@@ -2811,7 +2811,7 @@ Are you sure to overwrite the existing f
-     </message>
-     <message>
-         <location filename="../qjackctlSetupForm.ui" line="1092"/>
--        <source>Set client timeout limit in miliseconds</source>
-+        <source>Set client timeout limit in milliseconds</source>
-         <translation type="unfinished">クライアントのタイムリミットをミリ秒で指定します</translation>
-     </message>
-     <message>
-Index: qjackctl/src/translations/qjackctl_nl.ts
-===================================================================
---- qjackctl.orig/src/translations/qjackctl_nl.ts
-+++ qjackctl/src/translations/qjackctl_nl.ts
-@@ -2528,7 +2528,7 @@ Bent u zeker dat u de bestaande map wil
-     </message>
-     <message>
-         <location filename="../qjackctlSetupForm.ui" line="1092"/>
--        <source>Set client timeout limit in miliseconds</source>
-+        <source>Set client timeout limit in milliseconds</source>
-         <translation>Zet client timeout limiet in milisecondes</translation>
-     </message>
-     <message>
-Index: qjackctl/src/translations/qjackctl_ru.ts
-===================================================================
---- qjackctl.orig/src/translations/qjackctl_ru.ts
-+++ qjackctl/src/translations/qjackctl_ru.ts
-@@ -2473,7 +2473,7 @@ Are you sure to overwrite the existing f
-     </message>
-     <message>
-         <location filename="../qjackctlSetupForm.ui" line="1092"/>
--        <source>Set client timeout limit in miliseconds</source>
-+        <source>Set client timeout limit in milliseconds</source>
-         <translation>Установить тайм-аут для клиента в миллисекундах</translation>
-     </message>
-     <message>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5f1dbfc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01-configure-gcc6.patch
-02-spelling.patch

-- 
qjackctl packaging