1.11.2 → 1.11.3.

svn path=/trunk/; revision=53412

config.nmake

@@ -29,7 +29,7 @@ SVN_REVISION=0
 # Updated by make-version.pl
 VERSION_MAJOR=1
 VERSION_MINOR=11
-VERSION_MICRO=2
+VERSION_MICRO=3
 VERSION_BUILD=$(SVN_REVISION)
 
 # Local build information. Recommended: Unique string for your

configure.ac

@@ -3,7 +3,7 @@
 
 m4_define([version_major], [1])
 m4_define([version_minor], [11])
-m4_define([version_micro], [2])
+m4_define([version_micro], [3])
 m4_define([version_micro_extra], version_micro)
 m4_append([version_micro_extra], [])
 

debian/changelog

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

docbook/asciidoc.conf

@@ -4,7 +4,7 @@
 [replacements]
 
 # Yes, this is a fake macro.
-wireshark-version:\[\]=1.11.2
+wireshark-version:\[\]=1.11.3
 
 [macros]
 

docbook/release-notes.asciidoc

@@ -23,6 +23,11 @@ The following bugs have been fixed:
 
 === New and Updated Features
 
+The following features are new (or have been significantly updated)
+since version 1.11.2:
+
+* That feature you thought was great is even better.
+
 The following features are new (or have been significantly updated)
 since version 1.11.1:
 

epan/Makefile.am

@@ -56,7 +56,7 @@ ACLOCAL_AMFLAGS = `../aclocal-flags`
 noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
 lib_LTLIBRARIES = libwireshark.la
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwireshark_la_LDFLAGS = -version-info 0:2:0 @LDFLAGS_SHAREDLIB@
+libwireshark_la_LDFLAGS = -version-info 0:3:0 @LDFLAGS_SHAREDLIB@
 
 include Makefile.common
 

make-version.pl

@@ -75,7 +75,7 @@ my $set_release = 0;
 my %version_pref = (
 	"version_major" => 1,
 	"version_minor" => 11,
-	"version_micro" => 2,
+	"version_micro" => 3,
 	"version_build" => 0,
 
 	"enable"        => 1,
@@ -85,12 +85,12 @@ my %version_pref = (
 	"is_release"    => 0,
 
 	# 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 = ".";
 my $info_cmd = "";

wiretap/Makefile.am

@@ -30,7 +30,7 @@ include Makefile.common
 noinst_LTLIBRARIES = libwiretap_generated.la
 lib_LTLIBRARIES = libwiretap.la
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libwiretap_la_LDFLAGS = -version-info 0:2:0 @LDFLAGS_SHAREDLIB@
+libwiretap_la_LDFLAGS = -version-info 0:3:0 @LDFLAGS_SHAREDLIB@
 
 AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL