- Update to 3.12.0

PR:		130452
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 384 insertions, 17 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 340e7217577..9e3959e15ed 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	solfege
-PORTVERSION=	3.10.4
-PORTREVISION=	1
+PORTVERSION=	3.12.0
 CATEGORIES=	audio
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-nosound
@@ -17,9 +16,10 @@ PKGNAMESUFFIX=	-nosound
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free eartraining software
 
-BUILD_DEPENDS=	${STYLESHEET}:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	${STYLESHEET}:${PORTSDIR}/textproc/docbook-xsl \
+		txt2man:${PORTSDIR}/textproc/txt2man
 
-USE_GNOME=	gnomehack gnometarget libxslt pygtk2
+USE_GNOME=	gnomehack pygtk2
 WANT_GNOME=	yes
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
@@ -31,7 +31,7 @@ CONFIGURE_ARGS=	--disable-oss-sound \
 MAKE_ARGS=	skipmanual=yes
 USE_DISPLAY=	yes
 
-MAN1=		lessonfile_editor.1 solfege.1
+MAN1=		solfege.1
 
 STYLESHEET=	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl
 
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index 7f8601cc924..d681c39016f 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,3 +1,3 @@
-MD5 (solfege-3.10.4.tar.gz) = 74705388c446a10ed574e68bcd3134d4
-SHA256 (solfege-3.10.4.tar.gz) = f0765fc64a97c228768c3117ede4e2c5454683db026070838844add3361f69ec
-SIZE (solfege-3.10.4.tar.gz) = 3224645
+MD5 (solfege-3.12.0.tar.gz) = db6c86a5ed69dbd17ecce361609cbb7e
+SHA256 (solfege-3.12.0.tar.gz) = 06e3d85cc001c6252a3eb8882531dd659bc22d555c340fcadfb2e39272b687df
+SIZE (solfege-3.12.0.tar.gz) = 3528809
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index e9743b78384..b11d8b40072 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -1,4 +1,3 @@
-bin/lessonfile_editor
 bin/solfege
 etc/solfege
 share/applications/solfege.desktop
@@ -11,13 +10,13 @@ share/locale/hu/LC_MESSAGES/solfege.mo
 share/locale/it/LC_MESSAGES/solfege.mo
 share/locale/nb/LC_MESSAGES/solfege.mo
 share/locale/nl/LC_MESSAGES/solfege.mo
+share/locale/pl/LC_MESSAGES/solfege.mo
 share/locale/pt_BR/LC_MESSAGES/solfege.mo
 share/locale/ru/LC_MESSAGES/solfege.mo
 share/locale/sv/LC_MESSAGES/solfege.mo
 share/locale/tr/LC_MESSAGES/solfege.mo
 share/locale/vi/LC_MESSAGES/solfege.mo
 share/pixmaps/solfege.png
-%%DATADIR%%/debugtree.txt
 %%DATADIR%%/default.config
 %%DATADIR%%/example-lesson-files/chord-satb
 %%DATADIR%%/example-lesson-files/example-1
@@ -159,6 +158,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/C/elembuilder.html
 %%DATADIR%%/help/C/extending-solfege.html
 %%DATADIR%%/help/C/figures/chord.png
+%%DATADIR%%/help/C/figures/chordname-example.png
 %%DATADIR%%/help/C/figures/dictation.png
 %%DATADIR%%/help/C/figures/elembuilder-harmonic-progressions.png
 %%DATADIR%%/help/C/figures/id-interval-buttons-thirds.png
@@ -168,13 +168,16 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/C/figures/identifybpm.png
 %%DATADIR%%/help/C/figures/idtone.png
 %%DATADIR%%/help/C/figures/nameinterval.png
+%%DATADIR%%/help/C/figures/plabel-Cmaj7.png
 %%DATADIR%%/help/C/figures/preferences-external-programs.png
 %%DATADIR%%/help/C/figures/preferences-gui.png
 %%DATADIR%%/help/C/figures/preferences-midi.png
 %%DATADIR%%/help/C/figures/preferences-practise.png
 %%DATADIR%%/help/C/figures/preferences-sound-setup.png
 %%DATADIR%%/help/C/figures/preferences-user.png
+%%DATADIR%%/help/C/figures/progressionlabel-example-1.png
 %%DATADIR%%/help/C/figures/rhythm.png
+%%DATADIR%%/help/C/figures/rnc-example.png
 %%DATADIR%%/help/C/figures/singchord.png
 %%DATADIR%%/help/C/figures/singinterval.png
 %%DATADIR%%/help/C/figures/trainingset-editor.png
@@ -210,6 +213,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/C/melodicinterval-module.html
 %%DATADIR%%/help/C/melodicinterval.html
 %%DATADIR%%/help/C/midi-instrument-names.html
+%%DATADIR%%/help/C/mpd-module.html
 %%DATADIR%%/help/C/music-theory.html
 %%DATADIR%%/help/C/nameinterval-module.html
 %%DATADIR%%/help/C/nameinterval.html
@@ -537,10 +541,10 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/fr/melodicinterval-module.html
 %%DATADIR%%/help/fr/melodicinterval.html
 %%DATADIR%%/help/fr/midi-instrument-names.html
+%%DATADIR%%/help/fr/mpd-module.html
 %%DATADIR%%/help/fr/music-theory.html
 %%DATADIR%%/help/fr/nameinterval-module.html
 %%DATADIR%%/help/fr/nameinterval.html
-%%DATADIR%%/help/fr/one-big-page.html
 %%DATADIR%%/help/fr/online-resources.html
 %%DATADIR%%/help/fr/preferences-window.html
 %%DATADIR%%/help/fr/rhythm-module.html
@@ -606,6 +610,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/nb/melodicinterval-module.html
 %%DATADIR%%/help/nb/melodicinterval.html
 %%DATADIR%%/help/nb/midi-instrument-names.html
+%%DATADIR%%/help/nb/mpd-module.html
 %%DATADIR%%/help/nb/music-theory.html
 %%DATADIR%%/help/nb/nameinterval-module.html
 %%DATADIR%%/help/nb/nameinterval.html
@@ -674,10 +679,10 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/pt_BR/melodicinterval-module.html
 %%DATADIR%%/help/pt_BR/melodicinterval.html
 %%DATADIR%%/help/pt_BR/midi-instrument-names.html
+%%DATADIR%%/help/pt_BR/mpd-module.html
 %%DATADIR%%/help/pt_BR/music-theory.html
 %%DATADIR%%/help/pt_BR/nameinterval-module.html
 %%DATADIR%%/help/pt_BR/nameinterval.html
-%%DATADIR%%/help/pt_BR/one-big-page.html
 %%DATADIR%%/help/pt_BR/online-resources.html
 %%DATADIR%%/help/pt_BR/preferences-window.html
 %%DATADIR%%/help/pt_BR/rhythm-module.html
@@ -697,6 +702,58 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/pt_BR/trainingset-editor.html
 %%DATADIR%%/help/pt_BR/twelvetone.html
 %%DATADIR%%/help/pt_BR/welcome.html
+%%DATADIR%%/help/ru/appendix-not-documentation.html
+%%DATADIR%%/help/ru/bug-reporting.html
+%%DATADIR%%/help/ru/chord-module.html
+%%DATADIR%%/help/ru/chord.html
+%%DATADIR%%/help/ru/compareintervals-module.html
+%%DATADIR%%/help/ru/dictation-module.html
+%%DATADIR%%/help/ru/dictation.html
+%%DATADIR%%/help/ru/ear-training-test-printout-editor.html
+%%DATADIR%%/help/ru/elembuilder-module.html
+%%DATADIR%%/help/ru/elembuilder.html
+%%DATADIR%%/help/ru/extending-solfege.html
+%%DATADIR%%/help/ru/gpl.html
+%%DATADIR%%/help/ru/harmonicinterval-module.html
+%%DATADIR%%/help/ru/harmonicinterval.html
+%%DATADIR%%/help/ru/idbyname-cadences.html
+%%DATADIR%%/help/ru/idbyname-chords.html
+%%DATADIR%%/help/ru/idbyname-intonation.html
+%%DATADIR%%/help/ru/idbyname-module.html
+%%DATADIR%%/help/ru/identifybpm.html
+%%DATADIR%%/help/ru/idproperty-module.html
+%%DATADIR%%/help/ru/idproperty.html
+%%DATADIR%%/help/ru/idtone-module.html
+%%DATADIR%%/help/ru/idtone.html
+%%DATADIR%%/help/ru/index.html
+%%DATADIR%%/help/ru/inverting-intervals.html
+%%DATADIR%%/help/ru/lesson-files.html
+%%DATADIR%%/help/ru/melodicinterval-module.html
+%%DATADIR%%/help/ru/melodicinterval.html
+%%DATADIR%%/help/ru/midi-instrument-names.html
+%%DATADIR%%/help/ru/mpd-module.html
+%%DATADIR%%/help/ru/music-theory.html
+%%DATADIR%%/help/ru/nameinterval-module.html
+%%DATADIR%%/help/ru/nameinterval.html
+%%DATADIR%%/help/ru/online-resources.html
+%%DATADIR%%/help/ru/preferences-window.html
+%%DATADIR%%/help/ru/rhythm-module.html
+%%DATADIR%%/help/ru/rhythm.html
+%%DATADIR%%/help/ru/rhythmtapping-module.html
+%%DATADIR%%/help/ru/rhythmtapping2-module.html
+%%DATADIR%%/help/ru/rhythmtapping2.html
+%%DATADIR%%/help/ru/scales.html
+%%DATADIR%%/help/ru/singanswer-module.html
+%%DATADIR%%/help/ru/singchord-module.html
+%%DATADIR%%/help/ru/singchord.html
+%%DATADIR%%/help/ru/singinterval-module.html
+%%DATADIR%%/help/ru/singinterval.html
+%%DATADIR%%/help/ru/solfege-exercise-helps.html
+%%DATADIR%%/help/ru/solfege-intro.html
+%%DATADIR%%/help/ru/theory-intervals.html
+%%DATADIR%%/help/ru/trainingset-editor.html
+%%DATADIR%%/help/ru/twelvetone.html
+%%DATADIR%%/help/ru/welcome.html
 %%DATADIR%%/help/style.css
 %%DATADIR%%/help/tr/appendix-not-documentation.html
 %%DATADIR%%/help/tr/bug-reporting.html
@@ -744,10 +801,10 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/tr/melodicinterval-module.html
 %%DATADIR%%/help/tr/melodicinterval.html
 %%DATADIR%%/help/tr/midi-instrument-names.html
+%%DATADIR%%/help/tr/mpd-module.html
 %%DATADIR%%/help/tr/music-theory.html
 %%DATADIR%%/help/tr/nameinterval-module.html
 %%DATADIR%%/help/tr/nameinterval.html
-%%DATADIR%%/help/tr/one-big-page.html
 %%DATADIR%%/help/tr/online-resources.html
 %%DATADIR%%/help/tr/preferences-window.html
 %%DATADIR%%/help/tr/rhythm-module.html
@@ -769,7 +826,10 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/tr/welcome.html
 %%DATADIR%%/help-menu.xml
 %%DATADIR%%/helpbrowser.xml
-%%DATADIR%%/learningtree.txt
+%%DATADIR%%/learningtrees/csound-tree.txt
+%%DATADIR%%/learningtrees/debugtree.txt
+%%DATADIR%%/learningtrees/learningtree.txt
+%%DATADIR%%/learningtrees/mma
 %%DATADIR%%/lesson-files/altered-1
 %%DATADIR%%/lesson-files/altered-2
 %%DATADIR%%/lesson-files/barnesanger
@@ -812,6 +872,294 @@ share/pixmaps/solfege.png
 %%DATADIR%%/lesson-files/csound-fifth-0.996
 %%DATADIR%%/lesson-files/csound-fifth-0.997
 %%DATADIR%%/lesson-files/csound-fifth-0.998
+%%DATADIR%%/lesson-files/csound-intonation-M2-10cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-15cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-20cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-30cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-40cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-5cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-6cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-8cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-10cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-15cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-20cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-30cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-40cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-5cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-6cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-8cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-10cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-15cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-20cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-30cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-40cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-5cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-6cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-8cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-10cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-15cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-20cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-30cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-40cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-5cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-6cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj2-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj2-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj2-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj2-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj2-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj2-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj2-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj2-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj3-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj3-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj3-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj3-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj3-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj3-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj3-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj3-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj6-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj6-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj6-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj6-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj6-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj6-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj6-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj6-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj7-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj7-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj7-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj7-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj7-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj7-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj7-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-maj7-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min2-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min2-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min2-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min2-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min2-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min2-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min2-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min2-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min3-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min3-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min3-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min3-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min3-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min3-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min3-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min3-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min6-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min6-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min6-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min6-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min6-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min6-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min6-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min6-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min7-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min7-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min7-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min7-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min7-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min7-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min7-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-min7-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p4-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p4-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p4-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p4-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p4-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p4-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p4-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p4-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p5-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p5-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p5-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p5-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p5-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p5-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p5-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-p5-8cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-10cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-15cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-20cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-30cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-40cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-5cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-6cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-8cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-10cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-15cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-20cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-30cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-40cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-5cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-6cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-8cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-10cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-15cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-20cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-30cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-40cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-5cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-6cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-8cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-10cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-15cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-20cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-30cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-40cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-5cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-6cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-8cent
+%%DATADIR%%/lesson-files/csound-intonation-maj2-10cent
+%%DATADIR%%/lesson-files/csound-intonation-maj2-15cent
+%%DATADIR%%/lesson-files/csound-intonation-maj2-20cent
+%%DATADIR%%/lesson-files/csound-intonation-maj2-30cent
+%%DATADIR%%/lesson-files/csound-intonation-maj2-40cent
+%%DATADIR%%/lesson-files/csound-intonation-maj2-5cent
+%%DATADIR%%/lesson-files/csound-intonation-maj2-6cent
+%%DATADIR%%/lesson-files/csound-intonation-maj2-8cent
+%%DATADIR%%/lesson-files/csound-intonation-maj3-10cent
+%%DATADIR%%/lesson-files/csound-intonation-maj3-15cent
+%%DATADIR%%/lesson-files/csound-intonation-maj3-20cent
+%%DATADIR%%/lesson-files/csound-intonation-maj3-30cent
+%%DATADIR%%/lesson-files/csound-intonation-maj3-40cent
+%%DATADIR%%/lesson-files/csound-intonation-maj3-5cent
+%%DATADIR%%/lesson-files/csound-intonation-maj3-6cent
+%%DATADIR%%/lesson-files/csound-intonation-maj3-8cent
+%%DATADIR%%/lesson-files/csound-intonation-maj6-10cent
+%%DATADIR%%/lesson-files/csound-intonation-maj6-15cent
+%%DATADIR%%/lesson-files/csound-intonation-maj6-20cent
+%%DATADIR%%/lesson-files/csound-intonation-maj6-30cent
+%%DATADIR%%/lesson-files/csound-intonation-maj6-40cent
+%%DATADIR%%/lesson-files/csound-intonation-maj6-5cent
+%%DATADIR%%/lesson-files/csound-intonation-maj6-6cent
+%%DATADIR%%/lesson-files/csound-intonation-maj6-8cent
+%%DATADIR%%/lesson-files/csound-intonation-maj7-10cent
+%%DATADIR%%/lesson-files/csound-intonation-maj7-15cent
+%%DATADIR%%/lesson-files/csound-intonation-maj7-20cent
+%%DATADIR%%/lesson-files/csound-intonation-maj7-30cent
+%%DATADIR%%/lesson-files/csound-intonation-maj7-40cent
+%%DATADIR%%/lesson-files/csound-intonation-maj7-5cent
+%%DATADIR%%/lesson-files/csound-intonation-maj7-6cent
+%%DATADIR%%/lesson-files/csound-intonation-maj7-8cent
+%%DATADIR%%/lesson-files/csound-intonation-min2-10cent
+%%DATADIR%%/lesson-files/csound-intonation-min2-15cent
+%%DATADIR%%/lesson-files/csound-intonation-min2-20cent
+%%DATADIR%%/lesson-files/csound-intonation-min2-30cent
+%%DATADIR%%/lesson-files/csound-intonation-min2-40cent
+%%DATADIR%%/lesson-files/csound-intonation-min2-5cent
+%%DATADIR%%/lesson-files/csound-intonation-min2-6cent
+%%DATADIR%%/lesson-files/csound-intonation-min2-8cent
+%%DATADIR%%/lesson-files/csound-intonation-min3-10cent
+%%DATADIR%%/lesson-files/csound-intonation-min3-15cent
+%%DATADIR%%/lesson-files/csound-intonation-min3-20cent
+%%DATADIR%%/lesson-files/csound-intonation-min3-30cent
+%%DATADIR%%/lesson-files/csound-intonation-min3-40cent
+%%DATADIR%%/lesson-files/csound-intonation-min3-5cent
+%%DATADIR%%/lesson-files/csound-intonation-min3-6cent
+%%DATADIR%%/lesson-files/csound-intonation-min3-8cent
+%%DATADIR%%/lesson-files/csound-intonation-min6-10cent
+%%DATADIR%%/lesson-files/csound-intonation-min6-15cent
+%%DATADIR%%/lesson-files/csound-intonation-min6-20cent
+%%DATADIR%%/lesson-files/csound-intonation-min6-30cent
+%%DATADIR%%/lesson-files/csound-intonation-min6-40cent
+%%DATADIR%%/lesson-files/csound-intonation-min6-5cent
+%%DATADIR%%/lesson-files/csound-intonation-min6-6cent
+%%DATADIR%%/lesson-files/csound-intonation-min6-8cent
+%%DATADIR%%/lesson-files/csound-intonation-min7-10cent
+%%DATADIR%%/lesson-files/csound-intonation-min7-15cent
+%%DATADIR%%/lesson-files/csound-intonation-min7-20cent
+%%DATADIR%%/lesson-files/csound-intonation-min7-30cent
+%%DATADIR%%/lesson-files/csound-intonation-min7-40cent
+%%DATADIR%%/lesson-files/csound-intonation-min7-5cent
+%%DATADIR%%/lesson-files/csound-intonation-min7-6cent
+%%DATADIR%%/lesson-files/csound-intonation-min7-8cent
+%%DATADIR%%/lesson-files/csound-intonation-p4-10cent
+%%DATADIR%%/lesson-files/csound-intonation-p4-15cent
+%%DATADIR%%/lesson-files/csound-intonation-p4-20cent
+%%DATADIR%%/lesson-files/csound-intonation-p4-30cent
+%%DATADIR%%/lesson-files/csound-intonation-p4-40cent
+%%DATADIR%%/lesson-files/csound-intonation-p4-5cent
+%%DATADIR%%/lesson-files/csound-intonation-p4-6cent
+%%DATADIR%%/lesson-files/csound-intonation-p4-8cent
+%%DATADIR%%/lesson-files/csound-intonation-p5-10cent
+%%DATADIR%%/lesson-files/csound-intonation-p5-15cent
+%%DATADIR%%/lesson-files/csound-intonation-p5-20cent
+%%DATADIR%%/lesson-files/csound-intonation-p5-30cent
+%%DATADIR%%/lesson-files/csound-intonation-p5-40cent
+%%DATADIR%%/lesson-files/csound-intonation-p5-5cent
+%%DATADIR%%/lesson-files/csound-intonation-p5-6cent
+%%DATADIR%%/lesson-files/csound-intonation-p5-8cent
 %%DATADIR%%/lesson-files/diatonic-1
 %%DATADIR%%/lesson-files/diatonic-2
 %%DATADIR%%/lesson-files/fifth-small-pure-0.99
@@ -851,6 +1199,8 @@ share/pixmaps/solfege.png
 %%DATADIR%%/lesson-files/id-tone-cde-8
 %%DATADIR%%/lesson-files/id-tone-cde-9
 %%DATADIR%%/lesson-files/include/interval-elements
+%%DATADIR%%/lesson-files/include/jazz-progression-elements
+%%DATADIR%%/lesson-files/include/mma-grooves
 %%DATADIR%%/lesson-files/include/progression-elements
 %%DATADIR%%/lesson-files/include/sc-master
 %%DATADIR%%/lesson-files/interval_in_key_maj
@@ -899,6 +1249,9 @@ share/pixmaps/solfege.png
 %%DATADIR%%/lesson-files/melodic-intervals-up-7-9
 %%DATADIR%%/lesson-files/melodic-intervals-up-9
 %%DATADIR%%/lesson-files/melodic-intervals-up-tritonus-7
+%%DATADIR%%/lesson-files/mma-1
+%%DATADIR%%/lesson-files/mma-2
+%%DATADIR%%/lesson-files/mma-3
 %%DATADIR%%/lesson-files/nameinterval-1
 %%DATADIR%%/lesson-files/nameinterval-2
 %%DATADIR%%/lesson-files/nameinterval-fifths
@@ -1047,8 +1400,9 @@ share/pixmaps/solfege.png
 %%DATADIR%%/lesson-files/share/fifth-small-220.00.wav
 %%DATADIR%%/lesson-files/share/fifth-small-247.5.wav
 %%DATADIR%%/lesson-files/share/fifth-small-293.33.wav
-%%DATADIR%%/lesson-files/share/fil1.orc
 %%DATADIR%%/lesson-files/share/fil1.sco
+%%DATADIR%%/lesson-files/share/sinus-ad.orc
+%%DATADIR%%/lesson-files/share/sinus.orc
 %%DATADIR%%/lesson-files/sing-chord-tone
 %%DATADIR%%/lesson-files/sing-intervals
 %%DATADIR%%/lesson-files/sing-intervals-10
@@ -1076,6 +1430,11 @@ share/pixmaps/solfege.png
 %%DATADIR%%/lesson-files/singchord-5
 %%DATADIR%%/lesson-files/singchord-6
 %%DATADIR%%/lesson-files/singchord-all
+%%DATADIR%%/lesson-files/solfa-17
+%%DATADIR%%/lesson-files/solfa-17-C
+%%DATADIR%%/lesson-files/solfa-7
+%%DATADIR%%/lesson-files/solfa-7-C
+%%DATADIR%%/lesson-files/solfa-interval-1
 %%DATADIR%%/lesson-files/tapping-all
 %%DATADIR%%/lesson-files/tapping-easy
 %%DATADIR%%/lesson-files/tapping-mid
@@ -1083,6 +1442,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/lesson-files/twelvetone
 %%DATADIR%%/lesson-files/volkslieder1
 %%DATADIR%%/lesson-files/volkslieder2
+%%DATADIR%%/lesson-files/xxxx
 %%DATADIR%%/mpd/__init__.py
 %%DATADIR%%/mpd/__init__.pyc
 %%DATADIR%%/mpd/_exceptions.py
@@ -1136,6 +1496,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/regression-lesson-files/idbyname-mediafiles
 %%DATADIR%%/regression-lesson-files/idbyname-missing-.wav-file
 %%DATADIR%%/regression-lesson-files/idbyname-noquestionsinfile
+%%DATADIR%%/regression-lesson-files/idbyname-progressionlabel
 %%DATADIR%%/regression-lesson-files/idbyname-syntax-error-1
 %%DATADIR%%/regression-lesson-files/idbyname-syntax-error-2
 %%DATADIR%%/regression-lesson-files/idbyname-unsupported-named-block
@@ -1195,10 +1556,14 @@ share/pixmaps/solfege.png
 %%DATADIR%%/src/ElementTree.pyc
 %%DATADIR%%/src/__init__.py
 %%DATADIR%%/src/__init__.pyc
+%%DATADIR%%/src/_version.py
+%%DATADIR%%/src/_version.pyc
 %%DATADIR%%/src/abstract.py
 %%DATADIR%%/src/abstract.pyc
 %%DATADIR%%/src/app.py
 %%DATADIR%%/src/app.pyc
+%%DATADIR%%/src/buildinfo.py
+%%DATADIR%%/src/buildinfo.pyc
 %%DATADIR%%/src/cfg.py
 %%DATADIR%%/src/cfg.pyc
 %%DATADIR%%/src/chord.py
@@ -1207,8 +1572,6 @@ share/pixmaps/solfege.png
 %%DATADIR%%/src/chordvoicing.pyc
 %%DATADIR%%/src/compareintervals.py
 %%DATADIR%%/src/compareintervals.pyc
-%%DATADIR%%/src/configureoutput.py
-%%DATADIR%%/src/configureoutput.pyc
 %%DATADIR%%/src/configwindow.py
 %%DATADIR%%/src/configwindow.pyc
 %%DATADIR%%/src/dataparser.py
@@ -1319,6 +1682,8 @@ share/pixmaps/solfege.png
 %%DATADIR%%/src/utils.pyc
 %%DATADIR%%/src/uuid.py
 %%DATADIR%%/src/uuid.pyc
+%%DATADIR%%/src/winlang.py
+%%DATADIR%%/src/winlang.pyc
 %%DATADIR%%/src/winreg.py
 %%DATADIR%%/src/winreg.pyc
 %%DATADIR%%/src/xrandom.py
@@ -1345,8 +1710,10 @@ share/pixmaps/solfege.png
 @dirrm %%DATADIR%%/lesson-files/include
 @dirrm %%DATADIR%%/lesson-files/bin
 @dirrm %%DATADIR%%/lesson-files
+@dirrm %%DATADIR%%/learningtrees
 @dirrm %%DATADIR%%/help/tr/figures
 @dirrm %%DATADIR%%/help/tr
+@dirrm %%DATADIR%%/help/ru
 @dirrm %%DATADIR%%/help/pt_BR/figures
 @dirrm %%DATADIR%%/help/pt_BR
 @dirrm %%DATADIR%%/help/nb/figures