diff options
| -rw-r--r-- | config.nmake | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | docbook/release-notes.xml | 2 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
| -rwxr-xr-x | make-version.pl | 8 |
6 files changed, 9 insertions, 8 deletions
diff --git a/config.nmake b/config.nmake index eefe0df742..c7d2981167 100644 --- a/config.nmake +++ b/config.nmake @@ -16,7 +16,7 @@ WIRESHARK_TARGET_PLATFORM=win32 # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged VERSION_MAJOR=1 VERSION_MINOR=5 -VERSION_MICRO=1 +VERSION_MICRO=2 VERSION_BUILD=0 # It's recommended to change VERSION_EXTRA for your own custom builds # e.g. "-SVN-12345" diff --git a/configure.in b/configure.in index f0041af9c3..8db1d08000 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.5.1) +AC_INIT(wireshark, 1.5.2) dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or diff --git a/debian/changelog b/debian/changelog index 524d7e6db9..25a36fa197 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.5.1) unstable; urgency=low +wireshark (1.5.2) unstable; urgency=low * Self-made package diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml index 1eda4f3840..dfd4afd539 100644 --- a/docbook/release-notes.xml +++ b/docbook/release-notes.xml @@ -12,7 +12,7 @@ DOCUMENT SECTION <!-- Wireshark Info --> - <!ENTITY WiresharkCurrentVersion "1.5.1"> + <!ENTITY WiresharkCurrentVersion "1.5.2"> ]> diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 39f6df6ac2..62a6df6666 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -263,6 +263,7 @@ DISSECTOR_SRC = \ packet-auto_rp.c \ packet-ax4000.c \ packet-ayiya.c \ + packet-babel.c \ packet-bacapp.c \ packet-bacnet.c \ packet-banana.c \ diff --git a/make-version.pl b/make-version.pl index 8807dcf3c6..f59ba21495 100755 --- a/make-version.pl +++ b/make-version.pl @@ -72,12 +72,12 @@ my %version_pref = ( "format" => "SVN %Y%m%d%H%M%S", # Normal development builds - #"pkg_enable" => 1, - #"pkg_format" => "-SVN-%#", + "pkg_enable" => 1, + "pkg_format" => "-SVN-%#", # Development releases - "pkg_enable" => 0, - "pkg_format" => "", + #"pkg_enable" => 0, + #"pkg_format" => "", ); my $srcdir = "."; |