1.5.1 → 1.5.2. Reenable Babel.

svn path=/trunk/; revision=36540

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"

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

debian/changelog

@@ -1,4 +1,4 @@
-wireshark (1.5.1) unstable; urgency=low
+wireshark (1.5.2) unstable; urgency=low
 
   * Self-made package
 

docbook/release-notes.xml

@@ -12,7 +12,7 @@ DOCUMENT SECTION
 <!--
 Wireshark Info
 -->
-  <!ENTITY WiresharkCurrentVersion "1.5.1">
+  <!ENTITY WiresharkCurrentVersion "1.5.2">
 
 ]>
 

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		\

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 = ".";