From b1025a3ff26b64bee3a0c13663831bc018ec0260 Mon Sep 17 00:00:00 2001 From: Markus Rosenstihl Date: Thu, 2 Feb 2017 11:30:51 +0100 Subject: [PATCH] fixed cmake build for spc kernel driver --- README | 12 +++++++++++- debian/changelog | 10 ++++++++++ debian/control | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/README b/README index 502f8e3..16ee774 100644 --- a/README +++ b/README @@ -17,9 +17,12 @@ To start Damaris use for example: /opt/damaris-private/bin/DAMARIS -Updatine debian/changelog +Updating debian/changelog ========================= +Subversion +========== + Use the following command to get all the commit messages: Mac OS X: @@ -30,3 +33,10 @@ Linux: svn2cl -i -a --stdout |sed 's/^\t/ /'|sed -e '/^[0-9]/d' +Git +=== +git log --oneline . + + +Then pick the stuff the users need to know. +dch -M -v x.xx diff --git a/debian/changelog b/debian/changelog index 832d543..c6666fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +python-damaris (0.17) UNRELEASED; urgency=medium + * switch to git + * pytables v2 to v3 conversion done + * new syntax highlighter, abortable sleep function + * goniometer control for Marco Braun NMR probe head (AXYs) added + * added cmd line script to read out and set flow control (red-y series by Voegtlin) + * modifications to write_to_tecmag, allow 2D experiments (by Oleg Petrov) + + -- Markus Rosenstihl Wed, 01 Feb 2017 16:19:39 +0100 + python-damaris (0.16) UNRELEASED; urgency=medium * version bump diff --git a/debian/control b/debian/control index 6897bd8..c4bc0ff 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: python-damaris Section: science Priority: optional -Maintainer: Achim Gaedke +Maintainer: Markus Rosenstihl Build-Depends: debhelper, python-dev, python-central|dh-python, dpkg-dev Standards-Version: 3.7.3 XS-Python-Version: current