[SCM] qtractor/master: Patches refreshed.

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

The following commit has been merged in the master branch:
commit d3654570ad40ee837c796841993d6acbbb560778
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Jun 16 20:19:34 2016 +0200

    Patches refreshed.

diff --git a/debian/patches/04-q_atomic_ftbfs.patch b/debian/patches/04-q_atomic_ftbfs.patch
index 5cfd28a..47b0129 100644
--- a/debian/patches/04-q_atomic_ftbfs.patch
+++ b/debian/patches/04-q_atomic_ftbfs.patch
@@ -6,9 +6,11 @@ Author: Alessio Treglia <alessio at debian.org>
  src/qtractorAtomic.h |   40 ++++++++++++----------------------------
  1 file changed, 12 insertions(+), 28 deletions(-)
 
+Index: qtractor/src/qtractorAtomic.h
+===================================================================
 --- qtractor.orig/src/qtractorAtomic.h
 +++ qtractor/src/qtractorAtomic.h
-@@ -35,33 +35,7 @@ extern "C" {
+@@ -56,33 +56,7 @@ static inline int ATOMIC_CAS ( qtractorA
  
  #if defined(__GNUC__)
  
@@ -43,7 +45,7 @@ Author: Alessio Treglia <alessio at debian.org>
  
  static inline int ATOMIC_CAS1 (
  	volatile int *pValue, int iOldValue, int iNewValue )
-@@ -79,7 +53,17 @@ static inline int ATOMIC_CAS1 (
+@@ -100,7 +74,17 @@ static inline int ATOMIC_CAS1 (
  }
  
  #else
diff --git a/debian/patches/06-desktop.patch b/debian/patches/06-desktop.patch
index 3f8aedc..87ccd13 100644
--- a/debian/patches/06-desktop.patch
+++ b/debian/patches/06-desktop.patch
@@ -1,5 +1,4 @@
-Description:  Added "Keywords" to desktop file.
-Added exec-code
+Description: Added exec-code
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: no
 
@@ -7,7 +6,7 @@ Index: qtractor/src/qtractor.desktop.in
 ===================================================================
 --- qtractor.orig/src/qtractor.desktop.in
 +++ qtractor/src/qtractor.desktop.in
-@@ -5,9 +5,10 @@ GenericName=Multi-track Sequencer
+@@ -5,7 +5,7 @@ GenericName=Multi-track Sequencer
  GenericName[fr]=Séquenceur multi-pistes
  Comment=Qtractor is an Audio/MIDI multi-track sequencer application
  Comment[fr]=Qtractor est un séquenceur multi-pistes audio/MIDI
@@ -15,7 +14,4 @@ Index: qtractor/src/qtractor.desktop.in
 +Exec=@ac_prefix@/bin/qtractor %U
  Icon=qtractor
  Categories=Audio;AudioVideo;Midi;Sequencer;X-Multitrack;X-Alsa;X-Jack;Qt;
-+Keywords=jackd;audio;sound;DAW;
  MimeType=application/x-qtractor-session;application/x-qtractor-template;application/x-qtractor-archive;
- Terminal=false
- Type=Application

-- 
qtractor packaging