[med-svn] [SCM] aghermann branch, master, updated. 724c77b0538369ec38e134ce9dc8b5285fc65de4

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 724c77b0538369ec38e134ce9dc8b5285fc65de4
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Tue Dec 4 12:05:20 2012 +0200

    fix array<string> initialization to fix ubuntu build, release 0.7.5.1

diff --git a/ChangeLog b/ChangeLog
index e650ffd..c26a846 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+v.0.7.5.1 (2012-12-04)
+	* Fix Ububtu build.
 v.0.7.5 (2012-12-04)
 	* Experimental SWU profile; general overhaul of profiles.
 	* Fix SF Find dialog wrt search in a changed field channel.
diff --git a/configure.ac b/configure.ac
index 2a77b30..f1ca8cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_COPYRIGHT([Copyright (c) 2008-12 Andrei Zavada <johnhommer at gmail.com>])
 
-AC_INIT([Aghermann], [0.7.5], [johnhommer at gmail.com])
+AC_INIT([Aghermann], [0.7.5.1], [johnhommer at gmail.com])
 AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.61)
diff --git a/data/dialogs.glade b/data/dialogs.glade
index 335a669..f01e4e8 100644
--- a/data/dialogs.glade
+++ b/data/dialogs.glade
@@ -328,7 +328,7 @@
                     <property name="xalign">0</property>
                     <property name="xpad">5</property>
                     <property name="ypad">15</property>
-                    <property name="label" translatable="yes"><b><big><big>Aghermann 0.7.5</big></big></b> Bye-bye StrikeAd
+                    <property name="label" translatable="yes"><b><big><big>Aghermann 0.7.5.1</big></big></b> Bye-bye StrikeAd
 <a href="http://johnhommer.com/academic/code/aghermann">johnhommer.com/academic/code/aghermann</a></property>
                     <property name="use_markup">True</property>
                   </object>
@@ -424,7 +424,11 @@ With bug reports, either send yours to <a href="mailto:aghermann-users at lists.
                             <property name="yalign">0</property>
                             <property name="xpad">10</property>
                             <property name="ypad">10</property>
-                            <property name="label"><big><b>v. 0.7.5</b></big> (2012-12-03)
+                            <property name="label"><big><b>v. 0.7.5.1</b></big> (2012-12-04)
+<span font="monospace">
+	* Fix Ubuntu build.
+</span>
+<big><b>v. 0.7.5</b></big> (2012-12-03)
 <span font="monospace">
 	* Experimental SWU profile.
 	* General overhaul of profiles.
diff --git a/debian/changelog b/debian/changelog
index 9bf1136..045b6ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-aghermann (0.7.5-1) experimental; urgency=low
+aghermann (0.7.5.1-1) experimental; urgency=low
 
   * New upstream version.
 
- -- Andrei Zavada <johnhommer at gmail.com>  Mon, 03 Dec 2012 22:55:22 +0200
+ -- Andrei Zavada <johnhommer at gmail.com>  Tue, 04 Dec 2012 11:49:22 +0200
 
 aghermann (0.7.2-1) experimental; urgency=low
 
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index 2890352..460c2f0 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -148,9 +148,9 @@ SExpDesignUI (aghui::SSessionChooser *parent,
 	uc_accuracy_factor (1.),
 	pagesize_item (2),
 	binsize_item (1),
-	ext_score_codes {
-		{" -0", "1", "2", "3", "4", "6Rr8", "Ww5"}
-	},
+	ext_score_codes ({
+		{{" -0"}, {"1"}, {"2"}, {"3"}, {"4"}, {"6Rr8"}, {"Ww5"}}
+	}),
 	freq_bands {
 		{  1.5,  4.0 },
 		{  4.0,  8.0 },

-- 
Sleep experiment manager