Skip to content

Commit

Permalink
prepare release
Browse files Browse the repository at this point in the history
- set version to 0.8.1 and update user-dev-guide
- set package checkout scripts into 'tag' mode
- remove unstable version entries from debian changelogs
  • Loading branch information
Nico Kruber committed Jul 12, 2015
1 parent fb5910b commit f23e30c
Show file tree
Hide file tree
Showing 23 changed files with 30 additions and 48 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.1+git
0.8.1
18 changes: 9 additions & 9 deletions configure
Original file line number Diff line number Diff line change
@@ -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 <scalaris@googlegroups.com>.
#
Expand Down Expand Up @@ -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=''

Expand Down Expand Up @@ -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]...
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 $@
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion contrib/packages/bindings/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: Nico Kruber <kruber at zib dot de>

pkgname=scalaris-bindings
pkgver=0.8.1+git
pkgver=0.8.1
pkgrel=1
pkgdesc="Bindings and clients for Scalaris."
arch=('i686' 'x86_64')
Expand Down
4 changes: 2 additions & 2 deletions contrib/packages/bindings/checkout.sh
Original file line number Diff line number Diff line change
@@ -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

#####

Expand Down
6 changes: 0 additions & 6 deletions contrib/packages/bindings/debian.changelog
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
scalaris-bindings (0.8.1+git-1) unstable; urgency=low

* git snapshot from master

-- Nico Kruber <kruber@zib.de> 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/
Expand Down
2 changes: 1 addition & 1 deletion contrib/packages/bindings/scalaris-bindings.dsc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Format: 1.0
Source: scalaris-bindings
Version: 0.8.1+git-1
Version: 0.8.1-1
Maintainer: Nico Kruber <kruber@zib.de>
Architecture: all
Standards-Version: 3.9.6
Expand Down
2 changes: 1 addition & 1 deletion contrib/packages/bindings/scalaris-bindings.spec
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
4 changes: 2 additions & 2 deletions contrib/packages/examples-wiki/checkout.sh
Original file line number Diff line number Diff line change
@@ -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

#####

Expand Down
6 changes: 0 additions & 6 deletions contrib/packages/examples-wiki/debian.changelog
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
scalaris-examples-wiki (0.8.1+git-1) unstable; urgency=low

* git snapshot from master

-- Nico Kruber <kruber@zib.de> 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/
Expand Down
2 changes: 1 addition & 1 deletion contrib/packages/examples-wiki/scalaris-examples-wiki.dsc
Original file line number Diff line number Diff line change
@@ -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 <kruber@zib.de>
Architecture: all
Standards-Version: 3.9.6
Expand Down
2 changes: 1 addition & 1 deletion contrib/packages/examples-wiki/scalaris-examples-wiki.spec
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
2 changes: 1 addition & 1 deletion contrib/packages/main/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: Nico Kruber <kruber at zib dot de>
# Contributor: Roman Parykin <donderom at ymail dot com>
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')
Expand Down
4 changes: 2 additions & 2 deletions contrib/packages/main/checkout.sh
Original file line number Diff line number Diff line change
@@ -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

#####

Expand Down
6 changes: 0 additions & 6 deletions contrib/packages/main/debian.changelog
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
scalaris (0.8.1+git-1) unstable; urgency=low

* git snapshot from master

-- Nico Kruber <kruber@zib.de> 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/
Expand Down
2 changes: 1 addition & 1 deletion contrib/packages/main/scalaris.dsc
Original file line number Diff line number Diff line change
@@ -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 <kruber@zib.de>
Architecture: all
Expand Down
2 changes: 1 addition & 1 deletion contrib/packages/main/scalaris.spec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/systemd/scalaris.te
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module scalaris 0.8.1_git;
module scalaris 0.8.1;

require {
attribute port_type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public abstract class WikiServlet<Connection> 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;
Expand Down
2 changes: 1 addition & 1 deletion include/scalaris.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion java-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>de.zib.scalaris</groupId>
<artifactId>java-api</artifactId>
<version>0.8.1+git</version>
<version>0.8.1</version>
<packaging>jar</packaging>

<name>Scalaris Java API</name>
Expand Down
2 changes: 1 addition & 1 deletion python-api/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Binary file modified user-dev-guide/main.pdf
Binary file not shown.

0 comments on commit f23e30c

Please sign in to comment.