[SCM] drumkv1/master: Patches refreshed.

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

The following commit has been merged in the master branch:
commit 8e2bc2d7d9cb6c0e18351c8d49fd84c39fd32b57
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Sep 20 04:11:11 2016 +0200

    Patches refreshed.

diff --git a/debian/patches/0002-hardening_fix.patch b/debian/patches/0002-hardening_fix.patch
index a8a67ba..4384efa 100644
--- a/debian/patches/0002-hardening_fix.patch
+++ b/debian/patches/0002-hardening_fix.patch
@@ -6,7 +6,7 @@ Index: drumkv1/src/src_jack.pri.in
 ===================================================================
 --- drumkv1.orig/src/src_jack.pri.in
 +++ drumkv1/src/src_jack.pri.in
-@@ -9,5 +9,6 @@ INCLUDEPATH = @ac_jack_incpath@
+@@ -11,5 +11,6 @@ INCLUDEPATH = @ac_jack_incpath@
  LIBS += @ac_jack_libs@
  
  # Extra optimization flags
@@ -19,7 +19,7 @@ Index: drumkv1/src/src_lv2.pri.in
 ===================================================================
 --- drumkv1.orig/src/src_lv2.pri.in
 +++ drumkv1/src/src_lv2.pri.in
-@@ -9,5 +9,6 @@ INCLUDEPATH = @ac_lv2_incpath@
+@@ -11,5 +11,6 @@ INCLUDEPATH = @ac_lv2_incpath@
  LIBS += @ac_lv2_libs@
  
  # Extra optimization flags
diff --git a/debian/patches/0004-fix_install_path.patch b/debian/patches/0004-fix_install_path.patch
index e766b55..0cfc69f 100644
--- a/debian/patches/0004-fix_install_path.patch
+++ b/debian/patches/0004-fix_install_path.patch
@@ -6,25 +6,56 @@ Index: drumkv1/src/src_lv2.pro
 ===================================================================
 --- drumkv1.orig/src/src_lv2.pro
 +++ drumkv1/src/src_lv2.pro
-@@ -57,7 +57,7 @@ unix {
- 		isEmpty(LIBDIR) {
- 			LV2DIR = $${PREFIX}/lib/lv2
- 		} else {
--			LV2DIR = $${LIBDIR}/lv2
-+			LV2DIR = $${PREFIX}/lib/lv2
- 		}
+@@ -38,7 +38,7 @@ unix {
+ 	contains(PREFIX, $$system(echo $HOME)) {
+ 		LV2DIR = $${PREFIX}/.lv2
+ 	} else {
+-		LV2DIR = $${LIBDIR}/lv2
++		LV2DIR = $${PREFIX}/lib/lv2
  	}
  
+ 	TARGET_LV2 = $${NAME}.lv2/$${NAME}
+@@ -58,7 +58,7 @@ unix {
+ 
+ 	QMAKE_CLEAN += $${TARGET_LV2}.so
+ 
+-	LIBS += -L. -l$${NAME} -Wl,-rpath,$${LIBDIR}
++	LIBS += -L. -l$${NAME} -Wl,-rpath,$${LV2DIR}
+ }
+ 
+ QT -= gui
 Index: drumkv1/src/src_lv2ui.pro
 ===================================================================
 --- drumkv1.orig/src/src_lv2ui.pro
 +++ drumkv1/src/src_lv2ui.pro
 @@ -73,7 +73,7 @@ unix {
- 		isEmpty(LIBDIR) {
- 			LV2DIR = $${PREFIX}/lib/lv2
- 		} else {
--			LV2DIR = $${LIBDIR}/lv2
-+			LV2DIR = $${PREFIX}/lib/lv2
- 		}
+ 	contains(PREFIX, $$system(echo $HOME)) {
+ 		LV2DIR = $${PREFIX}/.lv2
+ 	} else {
+-		LV2DIR = $${LIBDIR}/lv2
++		LV2DIR = $${PREFIX}/lib/lv2
  	}
  
+ 	TARGET_LV2UI = $${NAME}.lv2/$${NAME}_ui
+@@ -103,7 +103,7 @@ unix {
+ 
+ 	QMAKE_CLEAN += $${TARGET_LV2UI}.so $${TARGET_LV2UI}.ttl
+ 
+-	LIBS += -L. -l$${NAME} -L$${NAME}.lv2 -Wl,-rpath,$${LIBDIR}:$${LV2DIR}/$${NAME}.lv2
++	LIBS += -L. -l$${NAME} -L$${NAME}.lv2 -Wl,-rpath,$${LV2DIR}:$${LV2DIR}/$${NAME}.lv2
+ }
+ 
+ QT += xml
+Index: drumkv1/src/src_jack.pro
+===================================================================
+--- drumkv1.orig/src/src_jack.pro
++++ drumkv1/src/src_jack.pro
+@@ -108,7 +108,7 @@ unix {
+ 	mimetypes_scalable.path = $${DATADIR}/icons/hicolor/scalable/mimetypes
+ 	mimetypes_scalable.files += mimetypes/application-x-$${NAME}-preset.svg
+ 
+-	LIBS += -L. -l$${NAME} -Wl,-rpath,$${LIBDIR}
++	LIBS += -L. -l$${NAME} -Wl,-rpath,$${BINDIR}
+ }
+ 
+ QT += xml

-- 
drumkv1 packaging