diff --git a/VERSION b/VERSION index 960e73b30..c81febec6 100644 --- a/VERSION +++ b/VERSION @@ -3,16 +3,16 @@ FWB_MAJOR_VERSION=3 FWB_MINOR_VERSION=0 -FWB_MICRO_VERSION=4 -VERSION="3.0.4" -SHORTVERSION="304" +FWB_MICRO_VERSION=5 +VERSION="3.0.5" +SHORTVERSION="305" # RELEASE="1" RELEASE="b@BUILD_NUM@" BETA="no" -REQUIRED_LIBFWBUILDER_VERSION="3.0.4" +REQUIRED_LIBFWBUILDER_VERSION="3.0.5" # current (or major) version number of the library so file # diff --git a/VERSION.h b/VERSION.h index 5717fd927..d40a7f7a9 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "3.0.4" +#define VERSION "3.0.5" #define RELEASE_NUM "" diff --git a/build_num b/build_num index d77a6de1b..90fcee3b8 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 794 +#define BUILD_NUM 797 diff --git a/doc/ChangeLog b/doc/ChangeLog index 77d77f5c0..0293af7fd 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2009-04-09 vadim + + * VERSION: start v3.0.5 + 2009-04-08 Vadim Kurland * v3.0.4 released, merged to the trunk, this comment is r796 diff --git a/qmake.inc b/qmake.inc index 286838457..38e3b05d3 100644 --- a/qmake.inc +++ b/qmake.inc @@ -12,7 +12,7 @@ DEFINES += $$(DEFINES) LANGUAGE = C++ UI_DIR = ui MANDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/man/ -DOCDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.4 +DOCDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5 HAVE_ANTLR_RUNTIME = 1 HAVE_EXTERNAL_ANTLR = 0 @@ -43,7 +43,7 @@ unix { target.path = $$PREFIX/bin dtd.path = @TEMPLATE_DIR@/ migration.path = @TEMPLATE_DIR@/migration - doc.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.4 + doc.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5 datadir.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/ diff --git a/src/res/os/freebsd.xml b/src/res/os/freebsd.xml index 37e08f27c..86957568d 100644 --- a/src/res/os/freebsd.xml +++ b/src/res/os/freebsd.xml @@ -1,5 +1,5 @@ - + FreeBSD freebsd diff --git a/src/res/os/fwsm_os.xml b/src/res/os/fwsm_os.xml index 84ffa484d..0f60019fe 100644 --- a/src/res/os/fwsm_os.xml +++ b/src/res/os/fwsm_os.xml @@ -1,5 +1,5 @@ - + Cisco FWSM fwb_pix diff --git a/src/res/os/ios.xml b/src/res/os/ios.xml index 060bb700b..003720f13 100644 --- a/src/res/os/ios.xml +++ b/src/res/os/ios.xml @@ -1,5 +1,5 @@ - + Cisco IOS fwb_iosacl diff --git a/src/res/os/linksys.xml b/src/res/os/linksys.xml index 874d443ca..e22bbe366 100644 --- a/src/res/os/linksys.xml +++ b/src/res/os/linksys.xml @@ -1,5 +1,5 @@ - + Linksys/Sveasoft linux24 diff --git a/src/res/os/linux24.xml b/src/res/os/linux24.xml index d65350651..64b079b86 100644 --- a/src/res/os/linux24.xml +++ b/src/res/os/linux24.xml @@ -1,5 +1,5 @@ - + Linux 2.4/2.6 linux24 diff --git a/src/res/os/macosx.xml b/src/res/os/macosx.xml index 3c40012c2..4ea92691a 100644 --- a/src/res/os/macosx.xml +++ b/src/res/os/macosx.xml @@ -1,5 +1,5 @@ - + Mac OS X macosx diff --git a/src/res/os/openbsd.xml b/src/res/os/openbsd.xml index 29d6a15b5..74f448bb6 100644 --- a/src/res/os/openbsd.xml +++ b/src/res/os/openbsd.xml @@ -1,5 +1,5 @@ - + OpenBSD openbsd diff --git a/src/res/os/pix_os.xml b/src/res/os/pix_os.xml index bd99d22eb..463893a55 100644 --- a/src/res/os/pix_os.xml +++ b/src/res/os/pix_os.xml @@ -1,5 +1,5 @@ - + Cisco PIX fwb_pix diff --git a/src/res/os/solaris.xml b/src/res/os/solaris.xml index 483d8e48c..82a9583e6 100644 --- a/src/res/os/solaris.xml +++ b/src/res/os/solaris.xml @@ -1,5 +1,5 @@ - + Solaris solaris diff --git a/src/res/os/unknown_os.xml b/src/res/os/unknown_os.xml index 8bab5ec2c..e639cb690 100644 --- a/src/res/os/unknown_os.xml +++ b/src/res/os/unknown_os.xml @@ -1,5 +1,5 @@ - + Unknown unknown diff --git a/src/res/platform/fwsm.xml b/src/res/platform/fwsm.xml index c8cd547ee..a03c51384 100644 --- a/src/res/platform/fwsm.xml +++ b/src/res/platform/fwsm.xml @@ -1,5 +1,5 @@ - + FWSM fwb_pix diff --git a/src/res/platform/iosacl.xml b/src/res/platform/iosacl.xml index dd2c3b7ad..51df07348 100644 --- a/src/res/platform/iosacl.xml +++ b/src/res/platform/iosacl.xml @@ -1,5 +1,5 @@ - + IOS ACL fwb_iosacl diff --git a/src/res/platform/ipf.xml b/src/res/platform/ipf.xml index aaabe495d..3c262aa2e 100644 --- a/src/res/platform/ipf.xml +++ b/src/res/platform/ipf.xml @@ -1,5 +1,5 @@ - + ipfilter fwb_ipf diff --git a/src/res/platform/ipfw.xml b/src/res/platform/ipfw.xml index 7a5fee1ac..64b7b26e9 100644 --- a/src/res/platform/ipfw.xml +++ b/src/res/platform/ipfw.xml @@ -1,5 +1,5 @@ - + ipfw fwb_ipfw diff --git a/src/res/platform/iptables.xml b/src/res/platform/iptables.xml index f3d4f5568..e733e6b68 100644 --- a/src/res/platform/iptables.xml +++ b/src/res/platform/iptables.xml @@ -1,5 +1,5 @@ - + iptables fwb_ipt diff --git a/src/res/platform/pf.xml b/src/res/platform/pf.xml index a05ef25c4..3d997720e 100644 --- a/src/res/platform/pf.xml +++ b/src/res/platform/pf.xml @@ -1,5 +1,5 @@ - + PF fwb_pf diff --git a/src/res/platform/pix.xml b/src/res/platform/pix.xml index fe5a90b4a..83fd1b8d4 100644 --- a/src/res/platform/pix.xml +++ b/src/res/platform/pix.xml @@ -1,5 +1,5 @@ - + PIX fwb_pix diff --git a/src/res/platform/unknown.xml b/src/res/platform/unknown.xml index 6fed72407..287047b53 100644 --- a/src/res/platform/unknown.xml +++ b/src/res/platform/unknown.xml @@ -1,5 +1,5 @@ - + Unknown diff --git a/src/res/resources.xml b/src/res/resources.xml index 211db2573..d0010e4b6 100644 --- a/src/res/resources.xml +++ b/src/res/resources.xml @@ -1,5 +1,5 @@ - + @PACKAGE_PIXMAPS_DIR@