[SCM] audacity/master: Patches refreshed.

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

The following commit has been merged in the master branch:
commit 7d9d9fff20842aa706c8c16c558fff11d10799bc
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Dec 11 11:06:36 2017 +0100

    Patches refreshed.

diff --git a/debian/patches/0002-workaround-wxwidgets-fit-recovery.patch b/debian/patches/0002-workaround-wxwidgets-fit-recovery.patch
index e3f09b0..fc57fae 100644
--- a/debian/patches/0002-workaround-wxwidgets-fit-recovery.patch
+++ b/debian/patches/0002-workaround-wxwidgets-fit-recovery.patch
@@ -21,7 +21,7 @@ Index: audacity/src/AutoRecovery.cpp
 ===================================================================
 --- audacity.orig/src/AutoRecovery.cpp
 +++ audacity/src/AutoRecovery.cpp
-@@ -41,6 +41,10 @@ class AutoRecoveryDialog final : public
+@@ -45,6 +45,10 @@ class AutoRecoveryDialog final : public
  public:
     AutoRecoveryDialog(wxWindow *parent);
  
@@ -32,7 +32,7 @@ Index: audacity/src/AutoRecovery.cpp
  private:
     void PopulateList();
     void PopulateOrExchange(ShuttleGui & S);
-@@ -69,6 +73,9 @@ BEGIN_EVENT_TABLE(AutoRecoveryDialog, wx
+@@ -73,6 +77,9 @@ BEGIN_EVENT_TABLE(AutoRecoveryDialog, wx
     EVT_BUTTON(ID_RECOVER_ALL, AutoRecoveryDialog::OnRecoverAll)
     EVT_BUTTON(ID_RECOVER_NONE, AutoRecoveryDialog::OnRecoverNone)
     EVT_BUTTON(ID_QUIT_AUDACITY, AutoRecoveryDialog::OnQuitAudacity)
@@ -42,7 +42,7 @@ Index: audacity/src/AutoRecovery.cpp
  END_EVENT_TABLE()
  
  void AutoRecoveryDialog::PopulateOrExchange(ShuttleGui& S)
-@@ -110,6 +117,22 @@ void AutoRecoveryDialog::PopulateOrExcha
+@@ -114,6 +121,22 @@ void AutoRecoveryDialog::PopulateOrExcha
     Center();
  }
  
diff --git a/debian/patches/0004-desktop.patch b/debian/patches/0004-desktop.patch
index 189b8b7..bd9f273 100644
--- a/debian/patches/0004-desktop.patch
+++ b/debian/patches/0004-desktop.patch
@@ -7,9 +7,9 @@ Index: audacity/src/audacity.desktop.in
 ===================================================================
 --- audacity.orig/src/audacity.desktop.in
 +++ audacity/src/audacity.desktop.in
-@@ -15,12 +15,14 @@ Comment[fr]=Enregistrer et éditer des f
- Comment[ru]=Запись и редактирование звуковых файлов
- Comment[uk]=Запис і редагування звукових файлів
+@@ -33,12 +33,14 @@ Comment[uk]=Запис і редагув
+ Comment[zh_CN]=录音和编辑音频文件
+ Comment[zh_TW]=錄音和編輯音訊檔案
  
 +Keywords=audio;sound;alsa;jack;editor;
 +
diff --git a/debian/patches/0005-Fix-building-against-the-system-portaudio-library.patch b/debian/patches/0005-Fix-building-against-the-system-portaudio-library.patch
index 80be001..97c98ac 100644
--- a/debian/patches/0005-Fix-building-against-the-system-portaudio-library.patch
+++ b/debian/patches/0005-Fix-building-against-the-system-portaudio-library.patch
@@ -27,11 +27,11 @@ over the code where it's used.
  src/AudioIO.cpp | 17 ++++++++++++++++-
  1 file changed, 16 insertions(+), 1 deletion(-)
 
-diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
-index a78bd1cab..d5481838d 100644
---- a/src/AudioIO.cpp
-+++ b/src/AudioIO.cpp
-@@ -452,8 +452,23 @@ writing audio.
+Index: audacity/src/AudioIO.cpp
+===================================================================
+--- audacity.orig/src/AudioIO.cpp
++++ audacity/src/AudioIO.cpp
+@@ -464,8 +464,23 @@ TimeTrack and AudioIOListener and whethe
     #define ROUND(x) (int) ((x)+0.5)
     //#include <string.h>
     #include "../lib-src/portmidi/pm_common/portmidi.h"
@@ -56,6 +56,3 @@ index a78bd1cab..d5481838d 100644
  #endif
  
  #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
--- 
-2.15.0
-

-- 
Audacity debian packaging