diff --git a/configure.ac b/configure.ac index de8e4def..bd9d6c7c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([stimfit],[0.14.14]) +AC_INIT([stimfit],[0.14.15]) AC_CONFIG_SRCDIR(src/stimfit/gui/main.cpp) AM_INIT_AUTOMAKE([1.11]) AM_SILENT_RULES([yes]) diff --git a/dist/conda/py-stfio-debug/meta.yaml b/dist/conda/py-stfio-debug/meta.yaml index 59dd9f9d..cb6c7b08 100644 --- a/dist/conda/py-stfio-debug/meta.yaml +++ b/dist/conda/py-stfio-debug/meta.yaml @@ -1,6 +1,6 @@ package: name: py-stfio-debug - version: "0.14.14" + version: "0.14.15" source: # Since this recipe is part of the git repo, the source is just a local path diff --git a/dist/conda/py-stfio/meta.yaml b/dist/conda/py-stfio/meta.yaml index 3156b4f1..31068a9c 100644 --- a/dist/conda/py-stfio/meta.yaml +++ b/dist/conda/py-stfio/meta.yaml @@ -1,6 +1,6 @@ package: name: py-stfio - version: "0.14.14" + version: "0.14.15" source: # Since this recipe is part of the git repo, the source is just a local path diff --git a/dist/debian/mkdeb.sh b/dist/debian/mkdeb.sh index 5818a6ca..202e5251 100755 --- a/dist/debian/mkdeb.sh +++ b/dist/debian/mkdeb.sh @@ -1,6 +1,6 @@ #! /bin/bash -VERSION=0.14.14 +VERSION=0.14.15 make dist mkdir -p ../deb/ diff --git a/dist/debian/mkquick.sh b/dist/debian/mkquick.sh index a53bbbe1..1e32b62b 100755 --- a/dist/debian/mkquick.sh +++ b/dist/debian/mkquick.sh @@ -1,6 +1,6 @@ #! /bin/bash -VERSION=0.14.14 +VERSION=0.14.15 make dist mkdir -p ../deb/ diff --git a/dist/macosx/macports/insert_checksums.sh b/dist/macosx/macports/insert_checksums.sh index 2906ddd5..21819b22 100755 --- a/dist/macosx/macports/insert_checksums.sh +++ b/dist/macosx/macports/insert_checksums.sh @@ -1,6 +1,6 @@ #! /bin/bash -STFVERSION="0.14.14" +STFVERSION="0.14.15" MPDIR=`pwd` if [ "$1" != "" ]; then diff --git a/dist/macosx/package.pmdoc/index.xml b/dist/macosx/package.pmdoc/index.xml index 2cc99054..4e74a095 100644 --- a/dist/macosx/package.pmdoc/index.xml +++ b/dist/macosx/package.pmdoc/index.xml @@ -1 +1 @@ -stimfit/Users/cs/stimfit-0.14.14.pkgstimfit.org/Users/cs/stimfit/gpl-2.0.txt01stimfit.xmlproperties.systemDomainproperties.titleproperties.anywhereDomainpostinstallActions.actions \ No newline at end of file +stimfit/Users/cs/stimfit-0.14.15.pkgstimfit.org/Users/cs/stimfit/gpl-2.0.txt01stimfit.xmlproperties.systemDomainproperties.titleproperties.anywhereDomainpostinstallActions.actions \ No newline at end of file diff --git a/dist/macosx/scripts/mkimage.sh b/dist/macosx/scripts/mkimage.sh index ef2eb19d..9a996a66 100644 --- a/dist/macosx/scripts/mkimage.sh +++ b/dist/macosx/scripts/mkimage.sh @@ -1,3 +1,3 @@ #! /bin/bash -hdiutil create stimfit-0.14.14.dmg -srcfolder ./stimfit.app -ov -format UDBZ +hdiutil create stimfit-0.14.15.dmg -srcfolder ./stimfit.app -ov -format UDBZ diff --git a/dist/macosx/stimfit.plist.in b/dist/macosx/stimfit.plist.in index 16725c87..f1647a05 100644 --- a/dist/macosx/stimfit.plist.in +++ b/dist/macosx/stimfit.plist.in @@ -26,13 +26,13 @@ CFBundleSignature ???? CFBundleVersion - 0.14.14 + 0.14.15 CFBundleShortVersionString - 0.14.14 + 0.14.15 CFBundleGetInfoString - stimfit version 0.14.14, (c) 2003-2011 C. Schmidt-Hieber + stimfit version 0.14.15, (c) 2003-2011 C. Schmidt-Hieber CFBundleLongVersionString - 0.14.14, (c) 2003-2011 C. Schmidt-Hieber + 0.14.15, (c) 2003-2011 C. Schmidt-Hieber NSHumanReadableCopyright Copyright 2003-2011 C. Schmidt-Hieber LSRequiresCarbon diff --git a/dist/windows/VS2008/Stimfit/Stimfit.suo b/dist/windows/VS2008/Stimfit/Stimfit.suo index a9b2a0f6..e627f142 100755 Binary files a/dist/windows/VS2008/Stimfit/Stimfit.suo and b/dist/windows/VS2008/Stimfit/Stimfit.suo differ diff --git a/dist/windows/nsis/installer.nsi b/dist/windows/nsis/installer.nsi index 88b41773..02fc8418 100755 --- a/dist/windows/nsis/installer.nsi +++ b/dist/windows/nsis/installer.nsi @@ -13,7 +13,7 @@ SetCompressor lzma ;-------------------------------- !include LogicLib.nsh -!define PRODUCT_VERSION "0.14.14" +!define PRODUCT_VERSION "0.14.15" !define WXW_VERSION "3.0.2.0" !define WXW_VERSION_DIR "3.0.2" !define WXW_VERSION_SHORT "30" diff --git a/doc/Doxyfile b/doc/Doxyfile index 761dfaf8..1856a363 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = Stimfit # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.14.14 +PROJECT_NUMBER = 0.14.15 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py index ad0d3af6..fd34f4c3 100644 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -49,9 +49,9 @@ # built documents. # # The short X.Y version. -version = '0.14.14' +version = '0.14.15' # The full version, including alpha/beta/rc tags. -release = '0.14.14' +release = '0.14.15' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 1da23a0b..adf6e541 100644 --- a/setup.py +++ b/setup.py @@ -202,7 +202,7 @@ setup(name='stfio', - version='0.14.14', + version='0.14.15', description='stfio module', include_dirs=system_info.default_include_dirs + [ np.get_include()], diff --git a/stfconf.h b/stfconf.h index 540630de..28e1d33e 100644 --- a/stfconf.h +++ b/stfconf.h @@ -5,7 +5,7 @@ #define PACKAGE_NAME "stimfit" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "stimfit 0.14.14" +#define PACKAGE_STRING "stimfit 0.14.15" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "stimfit" @@ -14,7 +14,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.14.14" +#define PACKAGE_VERSION "0.14.15" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1