From 856126c1cc731e28435a814cd3a98a749a7d5ef0 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 25 Apr 2011 11:58:14 -0700 Subject: [PATCH] started 4.2.1 --- VERSION | 4 ++-- VERSION.h | 2 +- doc/ChangeLog | 4 ++++ packaging/fwbuilder-static-qt.spec | 2 +- packaging/fwbuilder.control | 2 +- packaging/fwbuilder.spec | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index 96f1a4c88..2ecbd92cc 100644 --- a/VERSION +++ b/VERSION @@ -2,12 +2,12 @@ FWB_MAJOR_VERSION=4 FWB_MINOR_VERSION=2 -FWB_MICRO_VERSION=0 +FWB_MICRO_VERSION=1 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3530" +BUILD_NUM="3531" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index f18cab890..be804f0cf 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.0.3530" +#define VERSION "4.2.1.3531" #define GENERATION "4.2" diff --git a/doc/ChangeLog b/doc/ChangeLog index 4c15318d2..e0bcb6a68 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2011-04-25 Vadim Kurland + + * VERSION (GENERATION): version 4.2.0 released; started 4.2.1 + 2011-04-20 vadim * configlets/pix_os/script_skeleton: fixed bug (no #): "clear" diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 7121a8af7..b0b5dd55e 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.2.0.3530 +%define version 4.2.1.3531 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index 19fcb1d35..0ff3e17d2 100644 --- a/packaging/fwbuilder.control +++ b/packaging/fwbuilder.control @@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu Priority: extra Section: checkinstall Maintainer: vadim@fwbuilder.org -Version: 4.2.0.3530-1 +Version: 4.2.1.3531-1 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Description: Firewall Builder GUI and policy compilers diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec index 637a0f2e7..baa838905 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.0.3530 +%define version 4.2.1.3531 %define release 1 %if "%_vendor" == "MandrakeSoft"