From 2ab30436b9b14d0fd98bf76da99a2f0472b68985 Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Sat, 4 May 2013 11:51:52 +0200 Subject: [PATCH] Bump version for first public beta. --- README.md | 4 ++-- configure | 18 +++++++++--------- debian/changelog | 8 +++++++- platforms/deb/bareos-Debian_6.0.dsc | 2 +- platforms/deb/bareos-xUbuntu_12.04.dsc | 2 +- platforms/rpms/bareos.spec | 4 ++-- platforms/win32/winbareos-nsi.spec | 2 +- platforms/win32/winbareos32.spec | 2 +- platforms/win32/winbareos64.spec | 2 +- src/include/version.h | 17 +++++++++-------- 10 files changed, 34 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index e586ec13805..62084c32e70 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ BAREOS is a fork of the Bacula source code with the following changes (highlevel): -Release 12.4.0 +Release 12.4.x * First attempt at adding a rerun command. * Pass the restore context as parameter to display_job_parameters @@ -140,7 +140,7 @@ Long standing bugs fixed (bug numbers are from the bacula bug database): * OpenSuse 12.1 * OpenSuse 12.1 * OpenSuse factory - * More to come like Ubuntu etc. + * Ubuntu 12.04 * Fully automatic generation of new packages within one hour after new release of software or bugfix. * Fully automatic continuos integration tests of new packages with most major linux distribution diff --git a/configure b/configure index 1f7f30b0901..1adc855bd7d 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 bareos 12.4.0. +# Generated by GNU Autoconf 2.68 for bareos 12.4.1. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='bareos' PACKAGE_TARNAME='bareos' -PACKAGE_VERSION='12.4.0' -PACKAGE_STRING='bareos 12.4.0' +PACKAGE_VERSION='12.4.1' +PACKAGE_STRING='bareos 12.4.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1547,7 +1547,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 bareos 12.4.0 to adapt to many kinds of systems. +\`configure' configures bareos 12.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1616,7 +1616,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bareos 12.4.0:";; + short | recursive ) echo "Configuration of bareos 12.4.1:";; esac cat <<\_ACEOF @@ -1820,7 +1820,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bareos configure 12.4.0 +bareos configure 12.4.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2770,7 +2770,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 bareos $as_me 12.4.0, which was +It was created by bareos $as_me 12.4.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -31693,7 +31693,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 bareos $as_me 12.4.0, which was +This file was extended by bareos $as_me 12.4.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31759,7 +31759,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="\\ -bareos config.status 12.4.0 +bareos config.status 12.4.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/debian/changelog b/debian/changelog index 4d9c39e6fa4..14a563996db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ +bareos (12.4.1-1) unstable; urgency=low + + * Switch version number + + -- Marco van Wieringen Wed, 06 Feb 2013 15:09:10 +0100 + bareos (12.4.0-7) unstable; urgency=low * enable ndmp and scsi-crypto * remove deprecated gtk tray monitor - -- Marco van Wieringen Sun, 30 Dec 2012 16:51:18 +0100 + -- Marco van Wieringen Sun, 30 Dec 2012 16:51:18 +0100 bareos (12.4.0-6) unstable; urgency=low diff --git a/platforms/deb/bareos-Debian_6.0.dsc b/platforms/deb/bareos-Debian_6.0.dsc index 5b991ba7da0..8f24cb08267 100644 --- a/platforms/deb/bareos-Debian_6.0.dsc +++ b/platforms/deb/bareos-Debian_6.0.dsc @@ -2,7 +2,7 @@ Format: 3.0 (native) Source: bareos Binary: bareos, bareos-bat, bareos-bconsole, bareos-client, bareos-common, bareos-database-common, bareos-database-postgresql, bareos-database-mysql, bareos-database-sqlite3, bareos-database-tools, bareos-devel, bareos-director, bareos-doc, bareos-filedaemon, bareos-storage, bareos-tools, bareos-traymonitor Architecture: any -Version: 12.4.0 +Version: 12.4.1 Maintainer: Joerg Steffens Homepage: http://www.bareos.org/ Standards-Version: 3.8.4 diff --git a/platforms/deb/bareos-xUbuntu_12.04.dsc b/platforms/deb/bareos-xUbuntu_12.04.dsc index 328428510cb..60fc301063b 100644 --- a/platforms/deb/bareos-xUbuntu_12.04.dsc +++ b/platforms/deb/bareos-xUbuntu_12.04.dsc @@ -2,7 +2,7 @@ Format: 3.0 (native) Source: bareos Binary: bareos, bareos-bat, bareos-bconsole, bareos-client, bareos-common, bareos-database-common, bareos-database-postgresql, bareos-database-mysql, bareos-database-sqlite3, bareos-database-tools, bareos-devel, bareos-director, bareos-doc, bareos-filedaemon, bareos-storage, bareos-tools, bareos-traymonitor Architecture: any -Version: 12.4.0 +Version: 12.4.1 Maintainer: Joerg Steffens Homepage: http://www.bareos.org/ Standards-Version: 3.8.4 diff --git a/platforms/rpms/bareos.spec b/platforms/rpms/bareos.spec index 3fa8c3f322b..88247674958 100644 --- a/platforms/rpms/bareos.spec +++ b/platforms/rpms/bareos.spec @@ -33,7 +33,7 @@ Summary: The Network Backup Solution Name: bareos -Version: 12.4.0 +Version: 12.4.1 Release: 1.0 Group: Productivity/Archiving/Backup License: AGPL-3.0 @@ -42,7 +42,7 @@ URL: http://www.bareos.org/ Vendor: The Bareos Team #Packager: {_packager} -%define _libversion 12.4.0 +%define _libversion 12.4.1 %define plugin_dir %_libdir/bareos/plugins %define script_dir /usr/lib/bareos/scripts diff --git a/platforms/win32/winbareos-nsi.spec b/platforms/win32/winbareos-nsi.spec index bf4b37df970..4e1d221ba92 100644 --- a/platforms/win32/winbareos-nsi.spec +++ b/platforms/win32/winbareos-nsi.spec @@ -8,7 +8,7 @@ #!BuildIgnore: post-build-checks Name: winbareos-nsi -Version: 12.4.0 +Version: 12.4.1 Release: 0 Summary: bareos License: LGPLv2+ diff --git a/platforms/win32/winbareos32.spec b/platforms/win32/winbareos32.spec index 4931ef5784b..a29c32acd6e 100644 --- a/platforms/win32/winbareos32.spec +++ b/platforms/win32/winbareos32.spec @@ -8,7 +8,7 @@ Name: mingw32-winbareos -Version: 12.4.0 +Version: 12.4.1 Release: 0 Summary: bareos License: LGPLv2+ diff --git a/platforms/win32/winbareos64.spec b/platforms/win32/winbareos64.spec index 22e19e2cc70..175f58550ac 100644 --- a/platforms/win32/winbareos64.spec +++ b/platforms/win32/winbareos64.spec @@ -8,7 +8,7 @@ Name: mingw64-winbareos -Version: 12.4.0 +Version: 12.4.1 Release: 0 Summary: bareos License: LGPLv2+ diff --git a/src/include/version.h b/src/include/version.h index 645426e7e57..a873d26dc7c 100644 --- a/src/include/version.h +++ b/src/include/version.h @@ -1,7 +1,7 @@ #undef VERSION -#define VERSION "12.4.0" -#define BDATE "16 November 2012" -#define LSMDATE "16Nov12" +#define VERSION "12.4.1" +#define BDATE "06 February 2013" +#define LSMDATE "06Feb13" #define PROG_COPYRIGHT "Copyright (C) %d-2012 Free Software Foundation Europe e.V.\n" \ "Copyright (C) 2013-2013 Bareos GmbH & Co. KG\n" @@ -31,11 +31,12 @@ /* Shared object library versions */ /* Uncomment to overwrite default value from VERSION */ -/* #define LIBBAREOS_LT_RELEASE "12.4.0" */ -/* #define LIBBAREOSCFG_LT_RELEASE "12.4.0" */ -/* #define LIBBAREOSSQL_LT_RELEASE "12.4.0" */ -/* #define LIBBAREOSCATS_LT_RELEASE "12.4.0" */ -/* #define LIBBAREOSFIND_LT_RELEASE "12.4.0" */ +/* #define LIBBAREOS_LT_RELEASE "12.4.1" */ +/* #define LIBBAREOSCFG_LT_RELEASE "12.4.1" */ +/* #define LIBBAREOSSQL_LT_RELEASE "12.4.1" */ +/* #define LIBBAREOSCATS_LT_RELEASE "12.4.1" */ +/* #define LIBBAREOSCATS_LT_RELEASE "12.4.1" */ +/* #define LIBBAREOSNDMP_LT_RELEASE "12.4.1" */ /* Debug flags */ #undef DEBUG