[med-svn] [SCM] aghermann branch, master, updated. 5727b0b7844548ed4c4fceab25995fc02b87da50

Tue Dec 4 00:35:25 UTC 2012

The following commit has been merged in the master branch:
commit c21274567495b773b3801ae6cc4e27d172bd2a84
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Tue Dec 4 02:15:44 2012 +0200

    sundry build regressions; prepare for 0.7.5

diff --git a/ChangeLog b/ChangeLog
index fd97de6..e650ffd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-v.0.8.0 (2012-12-xx)
+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.
 
 v.0.7.4 (2012-11-10)
 	* PSD: don't apply windowing function twice (deeply sorry about that!).
diff --git a/configure.ac b/configure.ac
index e7c4dd1..2a77b30 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.8.0], [johnhommer at gmail.com])
+AC_INIT([Aghermann], [0.7.5], [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 79cc579..335a669 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.8</big></big></b>
+                    <property name="label" translatable="yes"><b><big><big>Aghermann 0.7.5</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,14 +424,16 @@ 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.4</b></big>
+                            <property name="label"><big><b>v. 0.7.5</b></big> (2012-12-03)
 <span font="monospace">
-	* PSD: don't apply windowing function twice (deeply sorry about that!).
+	* Experimental SWU profile.
+	* General overhaul of profiles.
+	* Fix SF Find dialog wrt search in a changed
+	  field channel.
 </span>
-<big><b>v. 0.7.3</b></big>
+<big><b>v. 0.7.4</b></big>
 <span font="monospace">
-	* Regression fix of initing in a dir that has been removed.
-	* Exec wget Experiment.tar.bz2 in a vte widget, lose system("xterm").
+	* PSD: don't apply windowing function twice (deeply sorry about that!).
 </span>
 (for older entries, see <a href="http://johnhommer.com/academic/code/aghermann">full changelog</a>)</property>
                             <property name="use_markup">True</property>
diff --git a/data/experiment-dl.sh b/data/experiment-dl.sh
old mode 100644
new mode 100755
diff --git a/debian/changelog b/debian/changelog
index cd96a9c..9bf1136 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+aghermann (0.7.5-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Andrei Zavada <johnhommer at gmail.com>  Mon, 03 Dec 2012 22:55:22 +0200
+
 aghermann (0.7.2-1) experimental; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 5d7cdf5..a45a900 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: aghermann
 Section: science
 Priority: optional
 Maintainer: Andrei Zavada <johnhommer at gmail.com>
-Build-Depends: debhelper (>= 9), dh-autoreconf, hardening-wrapper, hardening-includes, autoconf-archive, libgomp1, libconfig++-dev, pkg-config, libgsl0-dev, libfftw3-dev, libsamplerate0-dev (>= 0.1.7), libgtk-3-dev, libitpp-dev, libunique-3.0-dev, libxml2-utils
+Build-Depends: debhelper (>= 9), dh-autoreconf, hardening-wrapper, hardening-includes, autoconf-archive, libgomp1, libconfig++-dev, pkg-config, libgsl0-dev, libfftw3-dev, libsamplerate0-dev (>= 0.1.7), libgtk-3-dev, libitpp-dev, libunique-3.0-dev, libxml2-utils, libvte-2.90-dev
 Standards-Version: 3.9.3
 Homepage: http://johnhommer.com/academic/code/aghermann
 Vcs-Git: git://git.debian.org/git/debian-med/aghermann.git
@@ -14,7 +14,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: edfbrowser
 Description: Sleep-research experiment manager
  Aghermann is a program designed around a common workflow in
- sleep-research, complete with scoring facility, EEG power spectrum and
- power course visualization, and Process S simulation following
- Achermann et al, 1993.
+ sleep-research, complete with scoring facility; cairo subpixel
+ drawing on screen or to file; conventional PSD and EEG Micrcontinuity
+ profiles; Independent Component Analysis; artifact detection; and
+ Process S simulation following Achermann et al, 1993.
  
diff --git a/src/Makefile.am b/src/Makefile.am
index 1a36f97..4b1b25b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ aghermann_LDADD := \
 	ui/liba.a \
 	model/liba.a \
 	metrics/liba.a \
-	libsigfile/libsigfile.a \
+	libsigfile/liba.a \
 	sigproc/liba.a \
 	common/liba.a \
 	expdesign/liba.a \
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index e0d0036..99e4edf 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS := \
 edfcat_SOURCES := \
 	edfcat.cc
 edfcat_LDADD := \
-	../libsigfile/libsigfile.a \
+	../libsigfile/liba.a \
 	../sigproc/liba.a \
 	../common/liba.a \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \

-- 
Sleep experiment manager

