[SCM] samplv1/master: Package split.

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

The following commit has been merged in the master branch:
commit fbcf8600ccaa1f58852eb159d4266379f5446369
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Sep 26 18:54:56 2016 +0200

    Package split.

diff --git a/debian/control b/debian/control
index 5f47991..4ee8403 100644
--- a/debian/control
+++ b/debian/control
@@ -31,9 +31,26 @@ Depends:
  ${shlibs:Depends}
 Recommends:
  jackd
+Description: polyphonic sampler synthesizer - standalone
+ samplv1 is an old-school all-digital polyphonic sampler
+ synthesizer with stereo effects.
+ .
+ Although other samplers like specimen provide more features,
+ one could find samplv1 much easier and accessible. Plus it
+ is provided in both forms of a JACK stand-alone client and
+ a LV2 plugin.
+ .
+ This package provides standalone app and shared library.
+
+
+Package: samplv1-lv2
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Provides:
  lv2-plugin
-Description: polyphonic sampler synthesizer
+Description: polyphonic sampler synthesizer - lv2-plugin
  samplv1 is an old-school all-digital polyphonic sampler
  synthesizer with stereo effects.
  .
@@ -41,3 +58,5 @@ Description: polyphonic sampler synthesizer
  one could find samplv1 much easier and accessible. Plus it
  is provided in both forms of a JACK stand-alone client and
  a LV2 plugin.
+ .
+ This package provides lv2-plugin.
diff --git a/debian/patches/0002-fix_hardening.patch b/debian/patches/0002-fix_hardening.patch
index 077fdb6..31424b4 100644
--- a/debian/patches/0002-fix_hardening.patch
+++ b/debian/patches/0002-fix_hardening.patch
@@ -6,7 +6,7 @@ Index: samplv1/src/src_jack.pri.in
 ===================================================================
 --- samplv1.orig/src/src_jack.pri.in
 +++ samplv1/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: samplv1/src/src_lv2.pri.in
 ===================================================================
 --- samplv1.orig/src/src_lv2.pri.in
 +++ samplv1/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 8af8ee9..f117d1f 100644
--- a/debian/patches/0004-fix_install_path.patch
+++ b/debian/patches/0004-fix_install_path.patch
@@ -6,25 +6,69 @@ Index: samplv1/src/src_lv2.pro
 ===================================================================
 --- samplv1.orig/src/src_lv2.pro
 +++ samplv1/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,$${PREFIX}/lib/$${NAME}
+ }
+ 
+ QT -= gui
 Index: samplv1/src/src_lv2ui.pro
 ===================================================================
 --- samplv1.orig/src/src_lv2ui.pro
 +++ samplv1/src/src_lv2ui.pro
-@@ -72,7 +72,7 @@ unix {
- 		isEmpty(LIBDIR) {
- 			LV2DIR = $${PREFIX}/lib/lv2
- 		} else {
--			LV2DIR = $${LIBDIR}/lv2
-+			LV2DIR = $${PREFIX}/lib/lv2
- 		}
+@@ -71,7 +71,7 @@ unix {
+ 	contains(PREFIX, $$system(echo $HOME)) {
+ 		LV2DIR = $${PREFIX}/.lv2
+ 	} else {
+-		LV2DIR = $${LIBDIR}/lv2
++		LV2DIR = $${PREFIX}/lib/lv2
  	}
  
+ 	TARGET_LV2UI = $${NAME}.lv2/$${NAME}_ui
+@@ -101,7 +101,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,$${PREFIX}/lib/$${NAME}
+ }
+ 
+ QT += xml
+Index: samplv1/src/src_jack.pro
+===================================================================
+--- samplv1.orig/src/src_jack.pro
++++ samplv1/src/src_jack.pro
+@@ -106,7 +106,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,$${PREFIX}/lib/$${NAME}
+ }
+ 
+ QT += xml
+Index: samplv1/src/src_core.pro
+===================================================================
+--- samplv1.orig/src/src_core.pro
++++ samplv1/src/src_core.pro
+@@ -55,7 +55,7 @@ unix {
+ 
+ 	INSTALLS += target
+ 
+-	target.path = $${LIBDIR}
++	target.path = $${PREFIX}/lib/$${NAME}
+ }
+ 
+ QT -= gui
diff --git a/debian/samplv1-lv2.install b/debian/samplv1-lv2.install
new file mode 100644
index 0000000..77ce39c
--- /dev/null
+++ b/debian/samplv1-lv2.install
@@ -0,0 +1 @@
+usr/lib/lv2/samplv1.lv2/* usr/lib/lv2/samplv1.lv2/
diff --git a/debian/samplv1.install b/debian/samplv1.install
new file mode 100644
index 0000000..2189ae0
--- /dev/null
+++ b/debian/samplv1.install
@@ -0,0 +1,2 @@
+usr/bin/*
+usr/lib/samplv1/*.so.* usr/lib/samplv1/

-- 
samplv1 packaging