diff --git a/configure b/configure index 18e49c63..4ea96dd1 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.68 for parallel 20120411. +# Generated by GNU Autoconf 2.68 for parallel 20120422. # # Report bugs to . # @@ -559,8 +559,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='parallel' PACKAGE_TARNAME='parallel' -PACKAGE_VERSION='20120411' -PACKAGE_STRING='parallel 20120411' +PACKAGE_VERSION='20120422' +PACKAGE_STRING='parallel 20120422' PACKAGE_BUGREPORT='bug-parallel@gnu.org' PACKAGE_URL='' @@ -1176,7 +1176,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 parallel 20120411 to adapt to many kinds of systems. +\`configure' configures parallel 20120422 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1242,7 +1242,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of parallel 20120411:";; + short | recursive ) echo "Configuration of parallel 20120422:";; esac cat <<\_ACEOF @@ -1309,7 +1309,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -parallel configure 20120411 +parallel configure 20120422 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1326,7 +1326,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 parallel $as_me 20120411, which was +It was created by parallel $as_me 20120422, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2141,7 +2141,7 @@ fi # Define the identity of the package. PACKAGE='parallel' - VERSION='20120411' + VERSION='20120422' cat >>confdefs.h <<_ACEOF @@ -2704,7 +2704,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 parallel $as_me 20120411, which was +This file was extended by parallel $as_me 20120422, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2766,7 +2766,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="\\ -parallel config.status 20120411 +parallel config.status 20120422 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index a304aff0..9d3aa305 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([parallel], [20120411], [bug-parallel@gnu.org]) +AC_INIT([parallel], [20120422], [bug-parallel@gnu.org]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ diff --git a/packager/obs/Makefile b/packager/obs/Makefile index f10f4c8a..05225092 100644 --- a/packager/obs/Makefile +++ b/packager/obs/Makefile @@ -5,4 +5,4 @@ all: cp `ls ../../parallel-*.tar.bz2|tail -n1` home\:tange/parallel/ cd home\:tange/parallel/ && osc up cd home\:tange/parallel/ && parallel osc add ::: *.spec *.dsc *.tar.gz *.tar.bz2 && echo Src added OK || true - cd home\:tange/parallel/ && osc ci + cd home\:tange/parallel/ && osc ci -m "New release" diff --git a/packager/obs/home:tange/parallel/parallel.spec b/packager/obs/home:tange/parallel/parallel.spec index 434b7453..846ccab7 100644 --- a/packager/obs/home:tange/parallel/parallel.spec +++ b/packager/obs/home:tange/parallel/parallel.spec @@ -1,6 +1,6 @@ Summary: Shell tool for executing jobs in parallel Name: parallel -Version: 20120322 +Version: 20120422 Release: 1 License: GPL Group: Productivity/File utilities @@ -80,3 +80,4 @@ rm -rf $RPM_BUILD_ROOT - Untested upgrade to current git-version of source. * Sat Aug 08 2010 Markus Ammer - Initial package setup. + diff --git a/src/niceload b/src/niceload index 67c00503..735be98d 100755 --- a/src/niceload +++ b/src/niceload @@ -24,7 +24,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20120411; +$Global::version = 20120422; Getopt::Long::Configure("bundling","require_order"); get_options_from_array(\@ARGV) || die_usage(); if($::opt_version) { diff --git a/src/parallel b/src/parallel index 1fa3b080..87cabfc0 100755 --- a/src/parallel +++ b/src/parallel @@ -537,7 +537,7 @@ sub get_options_from_array { sub parse_options { # Returns: N/A # Defaults: - $Global::version = 20120421; + $Global::version = 20120422; $Global::progname = 'parallel'; $Global::infinity = 2**31; $Global::debug = 0; diff --git a/src/parallel.texi b/src/parallel.texi index f811f960..7d6b46d3 100644 --- a/src/parallel.texi +++ b/src/parallel.texi @@ -1425,11 +1425,11 @@ Use @strong{-v} @strong{-v} to print the wrapping ssh command when running remot Print the version GNU @strong{parallel} and exit. -@item @strong{--workdir} @emph{mydir} (beta testing) -@anchor{@strong{--workdir} @emph{mydir} (beta testing)} +@item @strong{--workdir} @emph{mydir} +@anchor{@strong{--workdir} @emph{mydir}} -@item @strong{--wd} @emph{mydir} (beta testing) -@anchor{@strong{--wd} @emph{mydir} (beta testing)} +@item @strong{--wd} @emph{mydir} +@anchor{@strong{--wd} @emph{mydir}} Files transferred using @strong{--transfer} and @strong{--return} will be relative to @emph{mydir} on remote computers, and the command will be executed in diff --git a/src/sql b/src/sql index 812b2106..6b42f62c 100755 --- a/src/sql +++ b/src/sql @@ -556,7 +556,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20120411; + $Global::version = 20120422; $Global::progname = 'sql'; # This must be done first as this may exec myself diff --git a/testsuite/wanted-results/sql01 b/testsuite/wanted-results/sql01 index b6ace3ab..43a8adec 100644 --- a/testsuite/wanted-results/sql01 +++ b/testsuite/wanted-results/sql01 @@ -39,8 +39,8 @@ def 3 2 17 2 17 ### Test --db-size --dbsize - 3 12 89 - 3 12 89 + 2 6 53 + 2 6 53 ### Test --table-size --tablesize 30 30