# HG changeset patch
# User Chris Cannam
# Date 1447848513 0
# Node ID b2c45b831ea8e98d658702dda28089b153d73583
# Parent  b0f6dce4eab088adf3fcb5d1fa9410e13b07d9c1# Parent  c977df9da61ede785cba1455e923338e00ec8fdc
Merge from default branch

diff -r b0f6dce4eab0 -r b2c45b831ea8 .hgsubstate
--- a/.hgsubstate	Tue Oct 20 09:14:24 2015 +0100
+++ b/.hgsubstate	Wed Nov 18 12:08:33 2015 +0000
@@ -5,5 +5,5 @@
 c6ca18292bfe9ba9bd67b0aa59320893f2954333 icons/scalable
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
 39e94df71d24b92f30f8215cb542d6e481e42281 svapp
-f8604a7c46606d2c09d03f4124b01908a0a5e373 svcore
-2937929ea6dcb27d8c5ad6e3d1636f12f30c002f svgui
+1309b66eff5372e435ebb12b8629b60221548fe4 svcore
+7242fe160c19015cf79440223b2f998236ea205f svgui
diff -r b0f6dce4eab0 -r b2c45b831ea8 .hgtags
--- a/.hgtags	Tue Oct 20 09:14:24 2015 +0100
+++ b/.hgtags	Wed Nov 18 12:08:33 2015 +0000
@@ -48,3 +48,5 @@
 cfbea29fae640aed5c8b7265d6806df823f34fef sv_v2.4
 8215909b74d2c58be28ce128d40fbc1645bc0d6e sv_v2.4_linux_deploy
 2868d5abf1a3baa37099c1b5d7e984bf8bb8177a sv_v2.4.1
+94253fa113183075c8400fa64d0ccb0e81682f90 sv_v2.5
+e206741df37ddfa3db28bfbbe4b79f2248b92695 sv_v2.5_osx_deploy
diff -r b0f6dce4eab0 -r b2c45b831ea8 CHANGELOG
--- a/CHANGELOG	Tue Oct 20 09:14:24 2015 +0100
+++ b/CHANGELOG	Wed Nov 18 12:08:33 2015 +0000
@@ -1,3 +1,18 @@
+Changes in Sonic Visualiser 2.5 since the previous release 2.4.1:
+
+ - Add unit-converter dialog, for converting between various pitch and
+   timing units
+
+ - Fix failure to reload note layers from session file
+
+ - Use a more sensible scale for the play-speed dial
+
+ - Fix crash when importing very wide CSV files
+
+ - Fix generation of wrong layer type from some CSV files
+
+ - Fix failure to export last instant in a time-instant layer
+
 Changes in Sonic Visualiser 2.4.1 since the previous release 2.4:
 
  - Fix a crash when rendering certain colour 3d plot layers
diff -r b0f6dce4eab0 -r b2c45b831ea8 configure
--- a/configure	Tue Oct 20 09:14:24 2015 +0100
+++ b/configure	Wed Nov 18 12:08:33 2015 +0000
@@ -4355,8 +4355,8 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-   	CXXFLAGS_ANY="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
-        CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g"
+   	CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
+        CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror"
    	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2"
    	CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
 fi
diff -r b0f6dce4eab0 -r b2c45b831ea8 configure.ac
--- a/configure.ac	Tue Oct 20 09:14:24 2015 +0100
+++ b/configure.ac	Wed Nov 18 12:08:33 2015 +0000
@@ -53,8 +53,8 @@
 CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
 
 if test "x$GCC" = "xyes"; then
-   	CXXFLAGS_ANY="-Wall -Wextra -Werror -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
-        CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g"
+   	CXXFLAGS_ANY="-Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
+        CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror"
    	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O2"
    	CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
 fi
diff -r b0f6dce4eab0 -r b2c45b831ea8 deploy/linux/debian-dependencies.sh
--- a/deploy/linux/debian-dependencies.sh	Tue Oct 20 09:14:24 2015 +0100
+++ b/deploy/linux/debian-dependencies.sh	Wed Nov 18 12:08:33 2015 +0000
@@ -37,6 +37,6 @@
 cat $rfile 1>&2
 echo 1>&2
 
-cat $pfile $rfile | sort | uniq -u | sed 's/$/,/' | fmt -1000 | sed 's/^/Depends: /' | sed 's/,$/, libc6/'
+cat $pfile $rfile | sort | uniq -u | sed 's/$/,/' | fmt -1000 | sed 's/^/Depends: /' | sed 's/,$/, libc6/' | sed 's/libjack0,/jackd,/'
 
 
diff -r b0f6dce4eab0 -r b2c45b831ea8 deploy/linux/deploy-deb.sh
--- a/deploy/linux/deploy-deb.sh	Tue Oct 20 09:14:24 2015 +0100
+++ b/deploy/linux/deploy-deb.sh	Wed Nov 18 12:08:33 2015 +0000
@@ -50,6 +50,10 @@
 
 perl -i -p -e "s/Depends: .*/$deps/" "$targetdir"/DEBIAN/control
 
+control_ver=${version%-?}
+
+perl -i -p -e "s/Version: .*/Version: $control_ver/" "$targetdir"/DEBIAN/control
+
 bash "$depdir"/fix-lintian-bits.sh "$targetdir"
 
 sudo dpkg-deb --build "$targetdir" && lintian "$targetdir".deb
diff -r b0f6dce4eab0 -r b2c45b831ea8 deploy/osx/copy-qt.sh
--- a/deploy/osx/copy-qt.sh	Tue Oct 20 09:14:24 2015 +0100
+++ b/deploy/osx/copy-qt.sh	Wed Nov 18 12:08:33 2015 +0000
@@ -9,7 +9,7 @@
 	exit 2
 fi
 
-frameworks="QtCore QtNetwork QtGui QtXml QtSvg QtWidgets QtPrintSupport"
+frameworks="QtCore QtNetwork QtGui QtXml QtSvg QtWidgets QtPrintSupport QtDBus"
 
 plugins="dds gif icns ico jp2 jpeg mng tga tiff wbmp webp cocoa minimal offscreen"
 
diff -r b0f6dce4eab0 -r b2c45b831ea8 deploy/osx/deploy.sh
--- a/deploy/osx/deploy.sh	Tue Oct 20 09:14:24 2015 +0100
+++ b/deploy/osx/deploy.sh	Wed Nov 18 12:08:33 2015 +0000
@@ -39,6 +39,21 @@
 deploy/osx/paths.sh "$app"
 
 echo
+echo "Copying in qt.conf to set local-only plugin paths."
+echo "Make sure all necessary Qt plugins are in $source/Contents/plugins/*"
+echo "You probably want platforms/, accessible/ and imageformats/ subdirectories."
+cp deploy/osx/qt.conf "$source"/Contents/Resources/qt.conf
+
+echo
+echo "Writing version $bundleVersion in to bundle."
+echo "(This should be a three-part number: major.minor.point)"
+
+perl -p -e "s/SV_VERSION/$bundleVersion/" deploy/osx/Info.plist \
+    > "$source"/Contents/Info.plist
+
+echo "Done: check $source/Contents/Info.plist for sanity please"
+
+echo
 echo "Making target tree."
 
 volume="$app"-"$version"
@@ -53,21 +68,6 @@
 
 echo "Done"
 
-echo
-echo "Copying in qt.conf to set local-only plugin paths."
-echo "Make sure all necessary Qt plugins are in $target/Contents/plugins/*"
-echo "You probably want platforms/, accessible/ and imageformats/ subdirectories."
-cp deploy/osx/qt.conf "$target"/Contents/Resources/qt.conf
-
-echo
-echo "Writing version $bundleVersion in to bundle."
-echo "(This should be a three-part number: major.minor.point)"
-
-perl -p -e "s/SV_VERSION/$bundleVersion/" deploy/osx/Info.plist \
-    > "$target"/Contents/Info.plist
-
-echo "Done: check $target/Contents/Info.plist for sanity please"
-
 deploy/osx/sign.sh "$volume" || exit 1
 
 echo
diff -r b0f6dce4eab0 -r b2c45b831ea8 deploy/osx/paths.sh
--- a/deploy/osx/paths.sh	Tue Oct 20 09:14:24 2015 +0100
+++ b/deploy/osx/paths.sh	Wed Nov 18 12:08:33 2015 +0000
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 app="$1"
 if [ -z "$app" ]; then
 	echo "Usage: $0 <appname>"
@@ -7,7 +9,9 @@
 	exit 2
 fi
 
-frameworks="QtCore QtNetwork QtGui QtXml QtSvg QtWidgets QtPrintSupport"
+set -u
+
+frameworks="QtCore QtNetwork QtGui QtXml QtSvg QtWidgets QtPrintSupport QtDBus"
 
 echo
 echo "I expect you to have already copied these frameworks from the Qt installation to"
@@ -27,7 +31,7 @@
 
 for fwk in $frameworks; do
         find "$app.app" -type f -print | while read x; do
-                current=$(otool -L "$x" | grep "$fwk" | grep amework | awk '{ print $1; }')
+                current=$(otool -L "$x" | grep "$fwk" | grep amework | grep -v ':$' | awk '{ print $1; }')
                 [ -z "$current" ] && continue
                 echo "$x has $current"
                 relative=$(echo "$x" | sed -e "s,$app.app/Contents/,," \
@@ -37,6 +41,16 @@
         done
 done
 
+find "$app.app" -type f -print | while read x; do
+    qtdep=$(otool -L "$x" | grep Qt | grep amework | grep -v ':$' | grep -v '@loader_path' | awk '{ print $1; }')
+    if [ -n "$qtdep" ]; then
+	echo
+	echo "ERROR: File $x depends on Qt framework(s) not apparently present in the bundle:"
+	echo $qtdep
+	exit 1
+    fi
+done
+
 echo "Done: be sure to run the app and see that it works!"