[med-svn] [aghermann] 39/60: update ChangeLog, remember to tweak tools/Makefile.am accordingly

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch WIP
in repository aghermann.

commit ef743f1aa02975919fae33138009a52e871f57fb
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Oct 20 00:08:13 2013 +0300

    update ChangeLog, remember to tweak tools/Makefile.am accordingly
---
 upstream/ChangeLog             |   19 +++++++++++++------
 upstream/src/tools/Makefile.am |    8 ++++----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/upstream/ChangeLog b/upstream/ChangeLog
index 20af068..78d6cb8 100644
--- a/upstream/ChangeLog
+++ b/upstream/ChangeLog
@@ -1,19 +1,26 @@
 v.0.9.2 (2013-xx-xx)
-	* New: Get a reasonable logging facility (use -l file; "-" is stdout; default is /dev/null).
-	* New: Properly handle various system/user/experiment/subject/session stored settings packs (patterns, rk1968, etc).
+	* New: SF: unified Artifact Detection dialog including MC-based,
+	  flat region (ex-Simple AD) and by EMG-perturbation.
+	* New: Get a reasonable logging facility (use -l file; "-" is
+	  stdout; default is /dev/null).
+	* New: Properly handle various system/user/experiment/subject/
+	  session stored settings packs (patterns, rk1968, etc).
 	* New: SF: basic dialog for RK1968 scoring assistant parameters.
-	* New: SF: draw EMG steady tone.
-	* Fix: SF: don't blindly delete files in various pattern locations, just append ~ to their file names.
+	* New: SF: compute, draw EMG steady tone.
+	* Fix: SF: don't blindly delete files in various pattern
+	  locations, just append ~ to their file names.
 	* Fix: SF: fix jump to next/prev annotations.
 	* Fix: SF: load patterns from symlinked files.
 	* Fix: Use subject ID in place of name if the latter is missing.
 	* Misc: Incorporate edfhed.glade in aghermann.gresources.
 	* Misc: SF: trivial optimisation in pattern search.
-	* Misc: Separate upstream tree from various distribution-related files.
+	* Misc: Separate upstream tree from distribution-related files.
+	* Misc: Do away with liba.a files.
 
 v.0.9.1.1 (2013-07-24)
 	* Fix 32-bit builds where sizeof(size_t) != sizeof(unsigned long).
-	* MW: take care to recalculate profile drawing area width on Shift+Scroll.
+	* MW: take care to recalculate profile drawing area width on
+	  Shift+Scroll.
 v.0.9.1 (2013-07-23)
 	* Reorg source tree around main executable, libs, & tools.
 	* Properly use our own lib*.so (previously aghermann turned out
diff --git a/upstream/src/tools/Makefile.am b/upstream/src/tools/Makefile.am
index f54cfb7..fd58e69 100644
--- a/upstream/src/tools/Makefile.am
+++ b/upstream/src/tools/Makefile.am
@@ -13,8 +13,8 @@ edfcat_SOURCES := \
 	edfcat.cc
 edfcat_LDADD := \
 	../libsigfile/libsigfile.la \
-	../common/liba.a \
 	../libsigproc/libsigproc.la \
+	../common/liba.a \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
 	$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
 
@@ -22,8 +22,8 @@ edfhed_SOURCES := \
 	edfhed.cc
 edfhed_LDADD := \
 	../libsigfile/libsigfile.la \
-	../common/liba.a \
 	../libsigproc/libsigproc.la \
+	../common/liba.a \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
 	$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
 
@@ -34,8 +34,8 @@ edfhed_gtk_CXXFLAGS := \
 	$(AM_CXXFLAGS) 	$(UNIQUE_CFLAGS) $(GTK_CFLAGS) -DPACKAGE_DATADIR=\"$(datadir)\"
 edfhed_gtk_LDADD := \
 	../libsigfile/libsigfile.la \
-	../common/liba.a \
 	../libsigproc/libsigproc.la \
+	../common/liba.a \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
 	$(GTK_LIBS) \
 	$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
@@ -45,9 +45,9 @@ agh_profile_gen_SOURCES := \
 	agh-profile-gen.cc
 agh_profile_gen_LDADD := \
 	../libsigfile/libsigfile.la \
-	../common/liba.a \
 	../libsigproc/libsigproc.la \
 	../libmetrics/libmetrics.la \
+	../common/liba.a \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
 	$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
 

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git