diff --git a/VERSION b/VERSION index 09f2fdc39..6f4eebdf6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.8.1+git +0.8.1 diff --git a/configure b/configure index da7579a55..b2ebe71b4 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for scalaris 0.8.1+git. +# Generated by GNU Autoconf 2.69 for scalaris 0.8.1. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='scalaris' PACKAGE_TARNAME='scalaris' -PACKAGE_VERSION='0.8.1+git' -PACKAGE_STRING='scalaris 0.8.1+git' +PACKAGE_VERSION='0.8.1' +PACKAGE_STRING='scalaris 0.8.1' PACKAGE_BUGREPORT='scalaris@googlegroups.com' PACKAGE_URL='' @@ -1249,7 +1249,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures scalaris 0.8.1+git to adapt to many kinds of systems. +\`configure' configures scalaris 0.8.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1310,7 +1310,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of scalaris 0.8.1+git:";; + short | recursive ) echo "Configuration of scalaris 0.8.1:";; esac cat <<\_ACEOF @@ -1413,7 +1413,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -scalaris configure 0.8.1+git +scalaris configure 0.8.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1472,7 +1472,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by scalaris $as_me 0.8.1+git, which was +It was created by scalaris $as_me 0.8.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5048,7 +5048,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by scalaris $as_me 0.8.1+git, which was +This file was extended by scalaris $as_me 0.8.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5101,7 +5101,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -scalaris config.status 0.8.1+git +scalaris config.status 0.8.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 746e6adcc..99a370e42 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ # limitations under the License. AC_PREREQ(2.65) -AC_INIT(scalaris, 0.8.1+git, scalaris@googlegroups.com) +AC_INIT(scalaris, 0.8.1, scalaris@googlegroups.com) EMAKEFILEDEFINES= EDOCMACROS= diff --git a/contrib/packages/bindings/PKGBUILD b/contrib/packages/bindings/PKGBUILD index 75a5bdc55..317f78c54 100644 --- a/contrib/packages/bindings/PKGBUILD +++ b/contrib/packages/bindings/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Nico Kruber pkgname=scalaris-bindings -pkgver=0.8.1+git +pkgver=0.8.1 pkgrel=1 pkgdesc="Bindings and clients for Scalaris." arch=('i686' 'x86_64') diff --git a/contrib/packages/bindings/checkout.sh b/contrib/packages/bindings/checkout.sh index 7b5f743dc..80ebcb1b8 100755 --- a/contrib/packages/bindings/checkout.sh +++ b/contrib/packages/bindings/checkout.sh @@ -1,13 +1,13 @@ #!/bin/bash -SCALARIS_VERSION="0.8.1+git" +SCALARIS_VERSION="0.8.1" date=`date +"%Y%m%d.%H%M"` name="scalaris" # folder base name (without version) pkg_name="scalaris-bindings" # package name url="https://github.com/scalaris-team/scalaris.git" deletefolder=0 # set to 1 to delete the folder the repository is checked out to # MODE: snapshot | tag -MODE=snapshot +MODE=tag ##### diff --git a/contrib/packages/bindings/debian.changelog b/contrib/packages/bindings/debian.changelog index 17f61315b..07781cc09 100644 --- a/contrib/packages/bindings/debian.changelog +++ b/contrib/packages/bindings/debian.changelog @@ -1,9 +1,3 @@ -scalaris-bindings (0.8.1+git-1) unstable; urgency=low - - * git snapshot from master - - -- Nico Kruber Sun, 12 Jul 2015 12:00:00 +0200 - scalaris-bindings (0.8.1-1) stable; urgency=low * partly supported by the EU project IES Cities http://iescities.eu/ diff --git a/contrib/packages/bindings/scalaris-bindings.dsc b/contrib/packages/bindings/scalaris-bindings.dsc index e337fb3a0..2cd68cc22 100644 --- a/contrib/packages/bindings/scalaris-bindings.dsc +++ b/contrib/packages/bindings/scalaris-bindings.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: scalaris-bindings -Version: 0.8.1+git-1 +Version: 0.8.1-1 Maintainer: Nico Kruber Architecture: all Standards-Version: 3.9.6 diff --git a/contrib/packages/bindings/scalaris-bindings.spec b/contrib/packages/bindings/scalaris-bindings.spec index 2b489d968..e2ed2e626 100644 --- a/contrib/packages/bindings/scalaris-bindings.spec +++ b/contrib/packages/bindings/scalaris-bindings.spec @@ -1,6 +1,6 @@ # norootforbuild -%define pkg_version 0.8.1+git +%define pkg_version 0.8.1 Name: scalaris-bindings Summary: Scalable Distributed key-value store Version: %{pkg_version} diff --git a/contrib/packages/examples-wiki/checkout.sh b/contrib/packages/examples-wiki/checkout.sh index 999c3fc9f..a98b7551b 100755 --- a/contrib/packages/examples-wiki/checkout.sh +++ b/contrib/packages/examples-wiki/checkout.sh @@ -1,13 +1,13 @@ #!/bin/bash -SCALARIS_VERSION="0.8.1+git" +SCALARIS_VERSION="0.8.1" date=`date +"%Y%m%d.%H%M"` name="scalaris" # folder base name (without version) pkg_name="scalaris-examples-wiki" # package name url="https://github.com/scalaris-team/scalaris.git" deletefolder=0 # set to 1 to delete the folder the repository is checked out to # MODE: snapshot | tag -MODE=snapshot +MODE=tag ##### diff --git a/contrib/packages/examples-wiki/debian.changelog b/contrib/packages/examples-wiki/debian.changelog index cf99e43b4..e8ef6db13 100644 --- a/contrib/packages/examples-wiki/debian.changelog +++ b/contrib/packages/examples-wiki/debian.changelog @@ -1,9 +1,3 @@ -scalaris-examples-wiki (0.8.1+git-1) unstable; urgency=low - - * git snapshot from master - - -- Nico Kruber Sun, 12 Jul 2015 12:00:00 +0200 - scalaris-examples-wiki (0.8.1-1) stable; urgency=low * partly supported by the EU project IES Cities http://iescities.eu/ diff --git a/contrib/packages/examples-wiki/scalaris-examples-wiki.dsc b/contrib/packages/examples-wiki/scalaris-examples-wiki.dsc index 1d2ec64d8..24bbd62db 100644 --- a/contrib/packages/examples-wiki/scalaris-examples-wiki.dsc +++ b/contrib/packages/examples-wiki/scalaris-examples-wiki.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: scalaris-examples-wiki -Version: 0.8.1+git-1 +Version: 0.8.1-1 Maintainer: Nico Kruber Architecture: all Standards-Version: 3.9.6 diff --git a/contrib/packages/examples-wiki/scalaris-examples-wiki.spec b/contrib/packages/examples-wiki/scalaris-examples-wiki.spec index a76c7ef3b..0432826e0 100644 --- a/contrib/packages/examples-wiki/scalaris-examples-wiki.spec +++ b/contrib/packages/examples-wiki/scalaris-examples-wiki.spec @@ -1,6 +1,6 @@ # norootforbuild -%define pkg_version 0.8.1+git +%define pkg_version 0.8.1 Name: scalaris-examples-wiki Summary: Wikipedia on Scalaris example Version: %{pkg_version} diff --git a/contrib/packages/main/PKGBUILD b/contrib/packages/main/PKGBUILD index c49930563..e9f5ad6b9 100644 --- a/contrib/packages/main/PKGBUILD +++ b/contrib/packages/main/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Nico Kruber # Contributor: Roman Parykin pkgname=scalaris -pkgver=0.8.1+git +pkgver=0.8.1 pkgrel=1 pkgdesc="A scalable, transactional, distributed key-value store." arch=('i686' 'x86_64') diff --git a/contrib/packages/main/checkout.sh b/contrib/packages/main/checkout.sh index f490d5327..e98dfc5d8 100755 --- a/contrib/packages/main/checkout.sh +++ b/contrib/packages/main/checkout.sh @@ -1,13 +1,13 @@ #!/bin/bash -SCALARIS_VERSION="0.8.1+git" +SCALARIS_VERSION="0.8.1" date=`date +"%Y%m%d.%H%M"` name="scalaris" # folder base name (without version) pkg_name="scalaris" # package name url="https://github.com/scalaris-team/scalaris.git" deletefolder=0 # set to 1 to delete the folder the repository is checked out to # MODE: snapshot | tag -MODE=snapshot +MODE=tag ##### diff --git a/contrib/packages/main/debian.changelog b/contrib/packages/main/debian.changelog index 525711158..d12e06832 100644 --- a/contrib/packages/main/debian.changelog +++ b/contrib/packages/main/debian.changelog @@ -1,9 +1,3 @@ -scalaris (0.8.1+git-1) unstable; urgency=low - - * git snapshot from master - - -- Nico Kruber Sun, 12 Jul 2015 12:00:00 +0200 - scalaris (0.8.1-1) stable; urgency=low * partly supported by the EU project IES Cities http://iescities.eu/ diff --git a/contrib/packages/main/scalaris.dsc b/contrib/packages/main/scalaris.dsc index 20096d67d..edb3d8e99 100644 --- a/contrib/packages/main/scalaris.dsc +++ b/contrib/packages/main/scalaris.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: scalaris -Version: 0.8.1+git-1 +Version: 0.8.1-1 Binary: scalaris Maintainer: Nico Kruber Architecture: all diff --git a/contrib/packages/main/scalaris.spec b/contrib/packages/main/scalaris.spec index 2a7fe2f42..ca4ea9297 100644 --- a/contrib/packages/main/scalaris.spec +++ b/contrib/packages/main/scalaris.spec @@ -1,6 +1,6 @@ # norootforbuild -%define pkg_version 0.8.1+git +%define pkg_version 0.8.1 %define scalaris_user scalaris %define scalaris_group scalaris %define scalaris_home /var/lib/scalaris diff --git a/contrib/systemd/scalaris.te b/contrib/systemd/scalaris.te index 3308a7ca9..d45decc24 100644 --- a/contrib/systemd/scalaris.te +++ b/contrib/systemd/scalaris.te @@ -1,4 +1,4 @@ -module scalaris 0.8.1_git; +module scalaris 0.8.1; require { attribute port_type; diff --git a/contrib/wikipedia/src/de/zib/scalaris/examples/wikipedia/bliki/WikiServlet.java b/contrib/wikipedia/src/de/zib/scalaris/examples/wikipedia/bliki/WikiServlet.java index 7934defcd..03f5ed6a9 100644 --- a/contrib/wikipedia/src/de/zib/scalaris/examples/wikipedia/bliki/WikiServlet.java +++ b/contrib/wikipedia/src/de/zib/scalaris/examples/wikipedia/bliki/WikiServlet.java @@ -96,7 +96,7 @@ public abstract class WikiServlet extends HttpServlet implements /** * Version of the "Wikipedia on Scalaris" example implementation. */ - public static final String version = "0.8.1+git"; + public static final String version = "0.8.1"; protected SiteInfo siteinfo = null; protected MyNamespace namespace = null; diff --git a/include/scalaris.hrl b/include/scalaris.hrl index c09912ba8..3cccdbf50 100644 --- a/include/scalaris.hrl +++ b/include/scalaris.hrl @@ -19,7 +19,7 @@ %% @version $Id$ %% Version of Scalaris --define(SCALARIS_VERSION, "0.8.1+git"). +-define(SCALARIS_VERSION, "0.8.1"). %% userdevguide-begin scalaris:rt %%The RT macro determines which kind of routingtable is used. Uncomment the diff --git a/java-api/pom.xml b/java-api/pom.xml index 7faeae14c..87e6ab9f1 100644 --- a/java-api/pom.xml +++ b/java-api/pom.xml @@ -4,7 +4,7 @@ de.zib.scalaris java-api - 0.8.1+git + 0.8.1 jar Scalaris Java API diff --git a/python-api/setup.py b/python-api/setup.py index 927d67dcd..5f962304f 100644 --- a/python-api/setup.py +++ b/python-api/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='scalaris', - version='0.8.1+git', + version='0.8.1', description='Scalaris python bindings', author='Nico Kruber', author_email='kruber@zib.de', diff --git a/user-dev-guide/main.pdf b/user-dev-guide/main.pdf index 6ca705b2f..23a7a375f 100644 Binary files a/user-dev-guide/main.pdf and b/user-dev-guide/main.pdf differ