[SCM] vocproc packaging branch, master, updated. debian/0.2-1-8-gcc851e5

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 97da5387ec78b2987e2f20d7e86a6313612ad266
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jun 25 12:48:17 2010 +0200

    Add several changes to 01-makefile.patch.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index c854702..af9052c 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -1,14 +1,40 @@
-Patch apllied to change install directory.
-Index: vocproc.lv2/Makefile
-===================================================================
---- vocproc.lv2.orig/Makefile	2010-06-05 16:52:25.561870000 +0200
-+++ vocproc.lv2/Makefile	2010-06-05 16:53:55.273870002 +0200
-@@ -2,7 +2,7 @@
+Description: Several changes to make it builds fine.
+ Add DESTDIR as prefix to installation target directory.
+ Rely on libpaq-dev's pkg-config information provided by paq.pc.
+ Due to a bug of lv2-c++-tools package currently in testing, we need to
+ rely on gtkmm-2.4 pkg-config .pc file explicitely.
+ .
+ We may drop some of the following patches after new lv2-c++-tools migrates
+ to testing.
+From: Alessio Treglia <alessio at debian.org>,
+ Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+---
+ Makefile |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- vocproc.orig/Makefile
++++ vocproc/Makefile
+@@ -2,7 +2,8 @@
  # By default plugin will be installed in /usr/local/lib/lv2.
  # You can change that by changing value of INSTALL_DIR
  
 -INSTALL_DIR = /usr/local/lib/lv2
-+INSTALL_DIR = /usr/lib/lv2
++DESTDIR=
++INSTALL_DIR = $(DESTDIR)/usr/lib/lv2
  
  
  # By default (because of the built in vocoder functionality) VocProc has two inputs and
+@@ -30,10 +31,10 @@ $(BUNDLE): manifest.ttl vocproc.ttl vocp
+ 	cp $^ $(BUNDLE)
+ 
+ vocproc.so: vocproc.cpp vocproc.peg
+-	g++ -shared -fPIC -DPIC $(DEFINES) vocproc.cpp `pkg-config --cflags --libs lv2-plugin fftw3` -lm -o vocproc.so
++	g++ -shared -fPIC -DPIC $(DEFINES) vocproc.cpp `pkg-config --cflags --libs fftw3 paq gtkmm-2.4` -lm -o vocproc.so
+ 
+ vocproc_gui.so: vocproc_gui.cpp vocproc.peg
+-	g++ -shared -fPIC -DPIC $(DEFINES) vocproc_gui.cpp `pkg-config --cflags --libs lv2-gui` -o vocproc_gui.so
++	g++ -shared -fPIC -DPIC $(DEFINES) vocproc_gui.cpp `pkg-config --cflags --libs paq gtkmm-2.4` -o vocproc_gui.so
+ 
+ prepare:
+ ifeq ($(DEFINES), -DNO_VOCODER)

-- 
vocproc packaging