[SCM] drumkv1/master: Patches refreshed/removed.

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

The following commit has been merged in the master branch:
commit 673aa44716b86c0a619528d2919c1bd46c693bf2
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Nov 21 10:36:33 2016 +0100

    Patches refreshed/removed.

diff --git a/debian/patches/0002-hardening_fix.patch b/debian/patches/0002-hardening_fix.patch
index 4384efa..576cde7 100644
--- a/debian/patches/0002-hardening_fix.patch
+++ b/debian/patches/0002-hardening_fix.patch
@@ -6,25 +6,25 @@ Index: drumkv1/src/src_jack.pri.in
 ===================================================================
 --- drumkv1.orig/src/src_jack.pri.in
 +++ drumkv1/src/src_jack.pri.in
-@@ -11,5 +11,6 @@ INCLUDEPATH = @ac_jack_incpath@
+@@ -13,5 +13,6 @@ INCLUDEPATH += @ac_jack_incpath@
  LIBS += @ac_jack_libs@
  
  # Extra optimization flags
--QMAKE_CXXFLAGS += @ac_cflags@
--QMAKE_LFLAGS += @ac_ldflags@
-+QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_cflags@
+-QMAKE_CXXFLAGS += @ac_jack_cflags@
+-QMAKE_LFLAGS += @ac_jack_ldflags@
++QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_jack_cflags@
 +QMAKE_CFLAGS += $(CPPFLAGS)
-+QMAKE_LFLAGS += $(LDFLAGS)
++QMAKE_LFLAGS += $(LDFLAGS) @ac_jack_ldflags@
 Index: drumkv1/src/src_lv2.pri.in
 ===================================================================
 --- drumkv1.orig/src/src_lv2.pri.in
 +++ drumkv1/src/src_lv2.pri.in
-@@ -11,5 +11,6 @@ INCLUDEPATH = @ac_lv2_incpath@
+@@ -13,5 +13,6 @@ INCLUDEPATH += @ac_lv2_incpath@
  LIBS += @ac_lv2_libs@
  
  # Extra optimization flags
--QMAKE_CXXFLAGS += @ac_cflags@
--QMAKE_LFLAGS += @ac_ldflags@
-+QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_cflags@
+-QMAKE_CXXFLAGS += @ac_lv2_cflags@
+-QMAKE_LFLAGS += @ac_lv2_ldflags@
++QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_lv2_cflags@
 +QMAKE_CFLAGS += $(CPPFLAGS)
-+QMAKE_LFLAGS += $(LDFLAGS)
++QMAKE_LFLAGS += $(LDFLAGS) @ac_lv2_ldflags@
diff --git a/debian/patches/0004-fix_install_path.patch b/debian/patches/0004-fix_install_path.patch
index e92327b..72dfde3 100644
--- a/debian/patches/0004-fix_install_path.patch
+++ b/debian/patches/0004-fix_install_path.patch
@@ -6,7 +6,7 @@ Index: drumkv1/src/src_lv2.pro
 ===================================================================
 --- drumkv1.orig/src/src_lv2.pro
 +++ drumkv1/src/src_lv2.pro
-@@ -38,7 +38,7 @@ unix {
+@@ -43,7 +43,7 @@ unix {
  	contains(PREFIX, $$system(echo $HOME)) {
  		LV2DIR = $${PREFIX}/.lv2
  	} else {
@@ -15,7 +15,7 @@ Index: drumkv1/src/src_lv2.pro
  	}
  
  	TARGET_LV2 = $${NAME}.lv2/$${NAME}
-@@ -58,7 +58,7 @@ unix {
+@@ -63,7 +63,7 @@ unix {
  
  	QMAKE_CLEAN += $${TARGET_LV2}.so
  
@@ -28,7 +28,7 @@ Index: drumkv1/src/src_lv2ui.pro
 ===================================================================
 --- drumkv1.orig/src/src_lv2ui.pro
 +++ drumkv1/src/src_lv2ui.pro
-@@ -73,7 +73,7 @@ unix {
+@@ -78,7 +78,7 @@ unix {
  	contains(PREFIX, $$system(echo $HOME)) {
  		LV2DIR = $${PREFIX}/.lv2
  	} else {
@@ -37,7 +37,7 @@ Index: drumkv1/src/src_lv2ui.pro
  	}
  
  	TARGET_LV2UI = $${NAME}.lv2/$${NAME}_ui
-@@ -103,7 +103,7 @@ unix {
+@@ -108,7 +108,7 @@ unix {
  
  	QMAKE_CLEAN += $${TARGET_LV2UI}.so $${TARGET_LV2UI}.ttl
  
@@ -50,7 +50,7 @@ Index: drumkv1/src/src_jack.pro
 ===================================================================
 --- drumkv1.orig/src/src_jack.pro
 +++ drumkv1/src/src_jack.pro
-@@ -108,7 +108,7 @@ unix {
+@@ -113,7 +113,7 @@ unix {
  	mimetypes_scalable.path = $${DATADIR}/icons/hicolor/scalable/mimetypes
  	mimetypes_scalable.files += mimetypes/application-x-$${NAME}-preset.svg
  
@@ -63,7 +63,7 @@ Index: drumkv1/src/src_core.pro
 ===================================================================
 --- drumkv1.orig/src/src_core.pro
 +++ drumkv1/src/src_core.pro
-@@ -55,7 +55,7 @@ unix {
+@@ -60,7 +60,7 @@ unix {
  
  	INSTALLS += target
  
diff --git a/debian/patches/0006-mimedescription.patch b/debian/patches/0006-mimedescription.patch
deleted file mode 100644
index 60adbba..0000000
--- a/debian/patches/0006-mimedescription.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: fixed description of mimetype
-Author: IOhannes m zmölnig
-Last-Update: 2016-09-28
-Forwarded: rncbc at rncbc.org
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- drumkv1.orig/src/mimetypes/drumkv1.xml
-+++ drumkv1/src/mimetypes/drumkv1.xml
-@@ -2,7 +2,7 @@
- <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-   <mime-type type="application/x-drumkv1-preset">
-     <sub-class-of type="text/xml"/>
--    <comment>synthv1 preset</comment>
-+    <comment>drumkv1 preset</comment>
-     <glob pattern="*.drumkv1"/>
-   </mime-type>
- </mime-info>
diff --git a/debian/patches/series b/debian/patches/series
index c12d404..fa74c69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0002-hardening_fix.patch
 0004-fix_install_path.patch
-0006-mimedescription.patch

-- 
drumkv1 packaging