[SCM] bristol/master: refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 31f7bd077550d9081b88ea97464628279a5a2f4a
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 14 06:14:48 2011 +0100

    refresh

diff --git a/debian/patches/01-export_statements.patch b/debian/patches/01-export_statements.patch
index cce6b7d..419a2af 100644
--- a/debian/patches/01-export_statements.patch
+++ b/debian/patches/01-export_statements.patch
@@ -9,13 +9,13 @@ Forwarded: https://sourceforge.net/support/tracker.php?aid=3096303
 
 --- bristol.orig/bin/startBristol.in
 +++ bristol/bin/startBristol.in
-@@ -424,9 +424,6 @@ fi
+@@ -442,9 +442,6 @@ fi
  export SLAB_HOME=$BRISTOL
  export BRIGHTON=$BRISTOL
  
 -export LD_LIBRARY_PATH=@BRISTOL_DIR@/lib:/usr/local/lib:/usr/lib:/lib
 -
--export PATH=${PATH}:$BRISTOL/bin:/usr/local/bin
+-export PATH=$BRISTOL/bin:/usr/local/bin:${PATH}
  
- if [ $jack -eq 1 ]; then
- 	ldd `which bristol` | grep jack > /dev/null 2>&1
+ if [ ${liblist} != 0 ]; then
+ 	echo

-- 
bristol packaging