[SCM] drumkv1/master: Package split (3).

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

The following commit has been merged in the master branch:
commit f7f153cbac2207e1649bf397c25341e36e002a18
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Sep 21 16:08:38 2016 +0200

    Package split (3).

diff --git a/debian/control b/debian/control
index 585bdc5..801332c 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,7 @@ Package: drumkv1
 Architecture: any
 Depends:
  ${misc:Depends},
- ${shlibs:Depends},
- drumkv1-lv2
+ ${shlibs:Depends}
 Recommends:
  jackd
 Description: old-school drum-kit sampler - standalone
@@ -39,13 +38,14 @@ Description: old-school drum-kit sampler - standalone
  client with JACK-session and both JACK MIDI and ALSA
  MIDI input support.
  .
- This package provides standalone app.
+ This package provides standalone app and shared library.
 
 Package: drumkv1-lv2
 Architecture: any
 Depends:
  ${misc:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ drumkv1
 Provides:
  lv2-plugin
 Description: old-school drum-kit sampler - lv2-plugin
@@ -56,33 +56,3 @@ Description: old-school drum-kit sampler - lv2-plugin
  MIDI input support.
  .
  This package provides lv2-plugin.
-
-Package: libdrumkv1-0
-Architecture: any
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Provides:
- lv2-plugin
-Description: old-school drum-kit sampler - shared library
- drumkv1 is an old-school all-digital drum-kit sampler
- synthesizer with stereo effects. It is provided in both
- forms of a LV2 plugin and a pure stand-alone JACK
- client with JACK-session and both JACK MIDI and ALSA
- MIDI input support.
- .
- This package provides shared library.
-
-Package: drumkv1-dev
-Section: libdevel
-Architecture: any
-Depends:
- ${misc:Depends}
-Description: old-school drum-kit sampler (development files)
- drumkv1 is an old-school all-digital drum-kit sampler
- synthesizer with stereo effects. It is provided in both
- forms of a LV2 plugin and a pure stand-alone JACK
- client with JACK-session and both JACK MIDI and ALSA
- MIDI input support.
- .
- This package provides the development files.
diff --git a/debian/drumkv1-dev.install b/debian/drumkv1-dev.install
deleted file mode 100644
index 012244d..0000000
--- a/debian/drumkv1-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/*.so
diff --git a/debian/drumkv1.install b/debian/drumkv1.install
index 1df36c6..a5c3209 100644
--- a/debian/drumkv1.install
+++ b/debian/drumkv1.install
@@ -1 +1,2 @@
 usr/bin/*
+usr/lib/drumkv1/*.so.* usr/lib/drumkv1/
diff --git a/debian/libdrumkv1-0.install b/debian/libdrumkv1-0.install
deleted file mode 100644
index 3de3b10..0000000
--- a/debian/libdrumkv1-0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/*.so.*
diff --git a/debian/patches/0004-fix_install_path.patch b/debian/patches/0004-fix_install_path.patch
index 0cfc69f..e92327b 100644
--- a/debian/patches/0004-fix_install_path.patch
+++ b/debian/patches/0004-fix_install_path.patch
@@ -20,7 +20,7 @@ Index: drumkv1/src/src_lv2.pro
  	QMAKE_CLEAN += $${TARGET_LV2}.so
  
 -	LIBS += -L. -l$${NAME} -Wl,-rpath,$${LIBDIR}
-+	LIBS += -L. -l$${NAME} -Wl,-rpath,$${LV2DIR}
++	LIBS += -L. -l$${NAME} -Wl,-rpath,$${PREFIX}/lib/$${NAME}
  }
  
  QT -= gui
@@ -42,7 +42,7 @@ Index: drumkv1/src/src_lv2ui.pro
  	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
++	LIBS += -L. -l$${NAME} -L$${NAME}.lv2 -Wl,-rpath,$${PREFIX}/lib/$${NAME}
  }
  
  QT += xml
@@ -55,7 +55,20 @@ Index: drumkv1/src/src_jack.pro
  	mimetypes_scalable.files += mimetypes/application-x-$${NAME}-preset.svg
  
 -	LIBS += -L. -l$${NAME} -Wl,-rpath,$${LIBDIR}
-+	LIBS += -L. -l$${NAME} -Wl,-rpath,$${BINDIR}
++	LIBS += -L. -l$${NAME} -Wl,-rpath,$${PREFIX}/lib/$${NAME}
  }
  
  QT += xml
+Index: drumkv1/src/src_core.pro
+===================================================================
+--- drumkv1.orig/src/src_core.pro
++++ drumkv1/src/src_core.pro
+@@ -55,7 +55,7 @@ unix {
+ 
+ 	INSTALLS += target
+ 
+-	target.path = $${LIBDIR}
++	target.path = $${PREFIX}/lib/$${NAME}
+ }
+ 
+ QT -= gui

-- 
drumkv1 packaging