[SCM] hydrogen/master: Patches refreshed/disabled.

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

The following commit has been merged in the master branch:
commit 372440926d8b073ff0e0497b3043ed68094ab8cb
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Nov 10 20:01:13 2016 +0100

    Patches refreshed/disabled.

diff --git a/debian/patches/1001_rubberband_path.patch b/debian/patches/1001_rubberband_path.patch
index 27b87c1..6086244 100644
--- a/debian/patches/1001_rubberband_path.patch
+++ b/debian/patches/1001_rubberband_path.patch
@@ -5,6 +5,8 @@ Last-Update: 2011-03-17
  data/hydrogen.default.conf |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+Index: hydrogen/data/hydrogen.default.conf
+===================================================================
 --- hydrogen.orig/data/hydrogen.default.conf
 +++ hydrogen/data/hydrogen.default.conf
 @@ -19,7 +19,7 @@
@@ -15,4 +17,4 @@ Last-Update: 2011-03-17
 +	<path_to_rubberband>/usr/bin/rubberband</path_to_rubberband>
  	<recentUsedSongs />
  	<recentlyUsedEffects />
-     	<serverList>
+ 	<serverList>
diff --git a/debian/patches/1005_name_shouldnt_repeat_genericname.patch b/debian/patches/1005_name_shouldnt_repeat_genericname.patch
index 3d65c3b..f656cba 100644
--- a/debian/patches/1005_name_shouldnt_repeat_genericname.patch
+++ b/debian/patches/1005_name_shouldnt_repeat_genericname.patch
@@ -16,23 +16,26 @@ Forwarded: no
  linux/hydrogen.desktop |   13 +++----------
  1 file changed, 3 insertions(+), 10 deletions(-)
 
+Index: hydrogen/linux/hydrogen.desktop
+===================================================================
 --- hydrogen.orig/linux/hydrogen.desktop
 +++ hydrogen/linux/hydrogen.desktop
-@@ -1,10 +1,5 @@
+@@ -1,11 +1,5 @@
  [Desktop Entry]
 -Name=Hydrogen Drum Machine
 -Name[de]=Hydrogen Drumsequencer
 -Name[ru]=Драм-машина Hydrogen
 -Name[hu]=Hydrogen Dobgép
 -Name[tr]=Hydrogen Davul Makinası
+-Name[fr]=Boîte à rythme Hydrogen
 -
 +Name=Hydrogen
  Comment=Create drum sequences
  Comment[de]=Schlagzeugsequenzen erstellen
  Comment[ru]=Создание партий ударных инструментов
-@@ -16,15 +11,13 @@ GenericName[de]=Drumsequencer
- GenericName[ru]=Драм-машина
+@@ -19,16 +13,14 @@ GenericName[ru]=Драм-машина
  GenericName[tr]=Davul Makinası
+ GenericName[fr]=Boîte à rythme
  
 -Encoding=UTF-8
  Version=1.0
@@ -40,6 +43,7 @@ Forwarded: no
  Type=Application
 -Categories=Application;AudioVideo;Sound;Audio;Qt;
 +Categories=AudioVideo;Audio;Qt;
+ Keywords=audio;sound;jackd;sampler;drum;
  
 -MimeType=text/xml
 +MimeType=text/xml;
diff --git a/debian/patches/1006_porttime.patch b/debian/patches/1006_porttime.patch
index 6953391..ce57083 100644
--- a/debian/patches/1006_porttime.patch
+++ b/debian/patches/1006_porttime.patch
@@ -9,10 +9,10 @@ Index: hydrogen/src/core/CMakeLists.txt
 ===================================================================
 --- hydrogen.orig/src/core/CMakeLists.txt
 +++ hydrogen/src/core/CMakeLists.txt
-@@ -47,6 +47,7 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VE
-     ${RUBBERBAND_LIBRARIES}
+@@ -50,6 +50,7 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VE
      ${ZLIB_LIBRARIES}
      ${CMAKE_THREAD_LIBS_INIT}
+     ${NSMSESSION_LIBRARIES}
 +    -lporttime
  )
  
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
index 2d7994e..0b04654 100644
--- a/debian/patches/ftbfs-gcc-4.7.diff
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -8,9 +8,11 @@ Forwarded: no
  src/gui/src/SongEditor/SongEditor.cpp |    1 +
  3 files changed, 3 insertions(+)
 
+Index: hydrogen/src/core/src/IO/portmidi_driver.cpp
+===================================================================
 --- hydrogen.orig/src/core/src/IO/portmidi_driver.cpp
 +++ hydrogen/src/core/src/IO/portmidi_driver.cpp
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
  #ifdef WIN32
  #include <windows.h>
  #endif
@@ -18,6 +20,8 @@ Forwarded: no
  
  #ifdef H2CORE_HAVE_PORTMIDI
  
+Index: hydrogen/src/gui/src/SongEditor/SongEditor.cpp
+===================================================================
 --- hydrogen.orig/src/gui/src/SongEditor/SongEditor.cpp
 +++ hydrogen/src/gui/src/SongEditor/SongEditor.cpp
 @@ -21,6 +21,7 @@
@@ -28,6 +32,8 @@ Forwarded: no
  #include <algorithm>
  #include <memory>
  
+Index: hydrogen/src/gui/src/MainForm.cpp
+===================================================================
 --- hydrogen.orig/src/gui/src/MainForm.cpp
 +++ hydrogen/src/gui/src/MainForm.cpp
 @@ -20,6 +20,7 @@
@@ -35,6 +41,6 @@ Forwarded: no
   */
  
 +#include <unistd.h>
+ #include <hydrogen/event_queue.h>
  #include <hydrogen/version.h>
  #include <hydrogen/hydrogen.h>
- #include <hydrogen/playlist.h>
diff --git a/debian/patches/series b/debian/patches/series
index 9fb994b..bd1e47f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-09_portaudio_v2.patch
+#09_portaudio_v2.patch
 1001_rubberband_path.patch
 1005_name_shouldnt_repeat_genericname.patch
 1006_porttime.patch
 ftbfs-gcc-4.7.diff
-1008-desktop.patch
+#1008-desktop.patch

-- 
hydrogen packaging