1.5.1 → 1.5.2. Reenable Babel.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36540 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/config.nmake b/config.nmake
index eefe0df742f7a395fac791a2902fd14c3cf61e78..c7d2981167bbb2dc219459c5dae28e3dcb801bcd 100644 (file)
--- 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
 # 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"
 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 f0041af9c37abea450043962e91c5908fe3e8601..8db1d08000f3c826197cb06ee6c3471dc1193f6f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 #
 AC_PREREQ(2.60)
 
 #
 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
 
 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 524d7e6db9c3a8c2f9353c9f9d70c3a2a0a8cd01..25a36fa197b3fb5c8bb0f5a8f9e182088acc4bc3 100644 (file)
--- 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
 
 
   * Self-made package
 

diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index 1eda4f3840ee0af8ce54f7afdaa2a9bf2ca36abc..dfd4afd539fdbd300b2a7d2743bc692b52f013a2 100644 (file)
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -12,7 +12,7 @@ DOCUMENT SECTION
 <!--
 Wireshark Info
 -->
 <!--
 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 39f6df6ac25bd8bd8f3aa0d8838477823e9d95d6..62a6df66668395c3398d506cfae28d9e9071263c 100644 (file)
--- 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-auto_rp.c        \
        packet-ax4000.c         \
        packet-ayiya.c          \

+       packet-babel.c          \

        packet-bacapp.c         \
        packet-bacnet.c         \
        packet-banana.c         \
        packet-bacapp.c         \
        packet-bacnet.c         \
        packet-banana.c         \

diff --git a/make-version.pl b/make-version.pl
index 8807dcf3c68765ea7eab53eacf76c5e8f22d0684..f59ba21495118e5431ff3e6865108884e5c6a8f2 100755 (executable)
--- 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
        "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
 
        # Development releases

-       "pkg_enable" => 0,
-       "pkg_format" => "",
+       #"pkg_enable" => 0,
+       #"pkg_format" => "",

        );
 my $srcdir = ".";
 
        );
 my $srcdir = ".";