# HG changeset patch
# User Chris Cannam
# Date 1379349641 -3600
# Node ID d4d2f93191556d05559d828d0b9b43685e5d15e9
# Parent  b19124b77ba52b1e5a0441ed21cd38938fbdc088# Parent  2093255c82034033a5d931b605904d59c4f7de86
Merge from default branch

diff -r b19124b77ba5 -r d4d2f9319155 .hgsubstate
--- a/.hgsubstate	Wed Jul 31 15:45:10 2013 +0100
+++ b/.hgsubstate	Mon Sep 16 17:40:41 2013 +0100
@@ -1,5 +1,5 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 619f715526df43e23b2b9b50715e825941572352 sv-dependency-builds
 2925a4bbca5e86036d564aaac1bcf7fd11226ca9 svapp
-fcee7e040ab49c70b5a90a6c34d91335de981d62 svcore
+1d439494604c3237775c3a18e4edb7e0c1fdc2d6 svcore
 0aea4b9e4c3dca9c42f9181748bdfde924a8574f svgui
diff -r b19124b77ba5 -r d4d2f9319155 .hgtags
--- a/.hgtags	Wed Jul 31 15:45:10 2013 +0100
+++ b/.hgtags	Mon Sep 16 17:40:41 2013 +0100
@@ -35,3 +35,5 @@
 ac16e50930326a4826b5813a6cae58b81c721044 sv_v2.2
 ac16e50930326a4826b5813a6cae58b81c721044 sv_v2.2
 29a97099b6473aa14251ec6392eb696cad4a6431 sv_v2.2
+29a97099b6473aa14251ec6392eb696cad4a6431 sv_v2.2
+a91416395daf6d8ac2b5f7330cc2e44ab699dc50 sv_v2.2
diff -r b19124b77ba5 -r d4d2f9319155 CITATION
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CITATION	Mon Sep 16 17:40:41 2013 +0100
@@ -0,0 +1,12 @@
+If you are using Sonic Visualiser in research work for publication,
+please cite:
+
+@InProceedings{SonicVisualiser,
+  author =    {C. Cannam and C. Landone and M. Sandler},
+  title =     {Sonic Visualiser: An Open Source Application for Viewing, Analysing, and Annotating Music Audio Files},
+  pages =     {1467--1468},
+  booktitle = {Proceedings of the ACM Multimedia 2010 International Conference},
+  month =     {October},
+  year =      {2010},
+  address =   {Firenze, Italy},
+}
diff -r b19124b77ba5 -r d4d2f9319155 deploy/linux/control.example
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/linux/control.example	Mon Sep 16 17:40:41 2013 +0100
@@ -0,0 +1,16 @@
+Package: sonic-visualiser
+Priority: optional
+Maintainer: Chris Cannam <cannam@all-day-breakfast.com>
+Architecture: PLACE ARCHITECTURE HERE i386 or amd64
+Version: PLACE VERSION HERE e.g. 2.2cc-1
+Depends: libqtgui4 (>= 4.5.0), libexpat1, libfontconfig1, libfreetype6, libice6,
+ libpcre3, libstdc++6, libx11-6, libxau6, libxcursor1, libxdmcp6, libxext6, libx
+fixes3, libxrender1, zlib1g, libasound2, libc6
+Description: View and analyse the contents of music audio files
+ Sonic Visualiser is an application for viewing and analysing the contents of mu
+sic audio files. It was developed at the Centre for Digital Music at Queen Mary,
+ University of London. Our aim is for it to be the first program you reach for w
+hen want to study a musical recording rather than simply listen to it.
+ We hope Sonic Visualiser will be of particular interest to musicologists, archi
+vists, signal-processing researchers and anyone else looking for a friendly way 
+to take a look at what lies inside the audio file.
diff -r b19124b77ba5 -r d4d2f9319155 deploy/linux/doc/sonic-visualiser/copyright
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/linux/doc/sonic-visualiser/copyright	Mon Sep 16 17:40:41 2013 +0100
@@ -0,0 +1,32 @@
+Sonic Visualiser was developed at the Centre for Digital Music,
+Queen Mary, University of London.
+
+  http://www.elec.qmul.ac.uk/digitalmusic/
+
+The main program is by Chris Cannam, with additional DSP and program
+design work by Christian Landone.  Thanks also to Craig Sapp for his
+suggestions and useful feedback.
+
+Code copyright 2005-2007 Chris Cannam and copyright 2006-2013 Queen
+Mary, University of London, except where indicated in the individual
+source files.
+
+This work was partially funded by the European Commission through the
+SIMAC project IST-FP6-507142 and the EASAIER project IST-FP6-033902.
+
+This work was partially funded by the Arts and Humanities Research
+Council through its Research Centre for the History and Analysis of
+Recorded Music (CHARM).
+
+This work was partially funded by the Engineering and Physical
+Sciences Research Council through the OMRAS2 project EP/E017614/1.
+
+This work was partially funded by the Engineering and Physical
+Sciences Research Council through the Musicology for the Masses
+project EP/I001832/1.
+
+Sonic Visualiser is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version. See the file /usr/share/common-licenses/GPL-2 
+for more information.