From f663759f585421c109f46b0e4b3dd99749c5420e Mon Sep 17 00:00:00 2001
From: Markus Rosenstihl <markus.rosenstihl@physik.tu-darmstadt.de>
Date: Mon, 15 Dec 2014 20:45:44 +0000
Subject: [PATCH] Updated front end version number to 0.15-0

---
 README                | 15 +++++++++++++
 debian/changelog      | 52 +++++++++++++++++++++++++++++++++++++++++++
 setup.py              |  2 +-
 src/gui/DamarisGUI.py |  2 +-
 4 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 7ca3811..502f8e3 100644
--- a/README
+++ b/README
@@ -15,3 +15,18 @@ or
 To start Damaris use for example:
 
 	/opt/damaris-private/bin/DAMARIS
+
+
+Updatine debian/changelog
+=========================
+
+Use the following command to get all the commit messages:
+
+Mac OS X:
+
+svn2cl -i -a --stdout |gsed 's/^\t/  /'|gsed -e '/^[0-9]/d'
+
+Linux:
+
+svn2cl -i -a --stdout |sed 's/^\t/  /'|sed -e '/^[0-9]/d'
+
diff --git a/debian/changelog b/debian/changelog
index 923ceef..da21c73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,55 @@
+python-damaris (0.15-0) experimental; urgency=low
+
+  * [r760] src/data/DaFFT.py[DEL]: Removed deprecated DaFFT module.
+    This module is replaced by DamarisFFT,
+    which extends the ADC_Result and Accumulation class.
+
+  * [r759] src/experiments/Experiment.py: * Updated more
+    documentation
+    - Fixes #4 (set_pfg)
+
+  * [r758] src/experiments/Experiment.py: Added sphinx documentation
+    strings
+  
+  * [r757] src/data/DamarisFFT.py: fixed taps/space, update
+    documentation
+  
+  * [r756] src/gui/DamarisGUI.py: reformatted DamarisGUI.py to make
+    it better readable
+  
+  * [r755] src/data/DamarisFFT.py, src/gui/DamarisGUI.py: fixed evil
+    tab/spaces
+  
+  * [r754] src/data/DamarisFFT.py: fix indentaion in DamarisFFT
+  
+  * [r753] src/data/DaFFT.py, src/data/DamarisFFT.py,
+    src/data/DataPool.py, src/data/MeasurementResult.py,
+    src/data/Persistance.py, src/data/autophase.py,
+    src/gui/BackendDriver.py, src/gui/ExperimentHandling.py,
+    src/gui/ExperimentWriter.py, src/gui/ResultHandling.py: Heroic
+    squashing of spurious furious tab bugs
+  
+  * [r741] migrate to standard svn repo layout
+  
+  * [r740] - exceptions now derive from a common DamarisException
+    class, which in turn derives from std::runtime_error
+    (previously, all exceptions derived from std::string, which is
+    not a good idea)
+    - I also added a RecoverableException class for ADC_result and
+    the like to derive from. This class should be
+    used whenever code is caught inside the backend, e.g. in the
+    experiment loop, and passed on to the frontend
+    without aborting
+    - backends were modified accordingly
+    - started adding a new test suite for more thorough unit tests
+    and to understand program flow better
+    - the working directory is now reset after a core is destroyed,
+    also cleaned up the getcwd code
+  
+  * [r737] - frontend fix for multi-channel detection
+
+ -- Markus Rosenstihl <Markus.Rosenstihl@physik.tu-darmstadt.de>  Mon, 15 Dec 2014 21:22:45 +0000
+
 python-damaris (0.14-svn) experimental; urgency=low
 
   * MeasurementResults (MR) can be lineplots (Oleg Petrov)
diff --git a/setup.py b/setup.py
index 9340840..ce7e5aa 100644
--- a/setup.py
+++ b/setup.py
@@ -93,7 +93,7 @@ GPL_LICENCE = "feed licence here"
 
 setup (
     name = 'python-damaris',
-    version = "0.14-svn",
+    version = "0.15-0",
     description = 'python frontend for DAMARIS (DArmstadt MAgnetic Resonance Instrument Software)',
     long_description = LONG_DESCRIPTION,
     author = 'Achim Gaedke',
diff --git a/src/gui/DamarisGUI.py b/src/gui/DamarisGUI.py
index 8598794..e810a47 100644
--- a/src/gui/DamarisGUI.py
+++ b/src/gui/DamarisGUI.py
@@ -80,7 +80,7 @@ from damaris.data import DataPool, Accumulation, ADC_Result, MeasurementResult
 debug = False
 
 # version info
-__version__ = "0.14-svn-$Revision$"
+__version__ = "0.15-0-$Revision$"
 
 
 class logstream: