1.11.2 → 1.11.3.

svn path=/trunk/; revision=53412

diff --git a/config.nmake b/config.nmake
index a474d08fcace5803084d6e45b595bffbf1e4c549..2d0bd917cf647f2fe8967db4a5f7ab62ef674959 100644 (file)
--- a/config.nmake
+++ b/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

diff --git a/configure.ac b/configure.ac
index d622fab47defe3bfa6c5ef26a2652679ac9401da..9f00ed8c1723721feff671e39eca664407d51a08 100644 (file)
--- a/configure.ac
+++ b/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], [])
 

diff --git a/debian/changelog b/debian/changelog
index 83483977794001393a9f65a3d9e324474ee06ba5..663009bf01df2581612fb53ebdcaf28c247e4d73 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.11.2) unstable; urgency=low
+wireshark (1.11.3) unstable; urgency=low
 
   * Self-made package
 

diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index 026fe0d4b212cc4d3467dfb2ab89dc63dda42e95..51c70e63f693b5d7b0096cec1d9f2d29e778cc83 100644 (file)
--- a/docbook/asciidoc.conf
+++ b/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]
 

diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index 399b35e73822be5c27e75867332abf556c2542ae..414c3841f3f9a060564d77f66c0de2b1dc8db73c 100644 (file)
--- a/docbook/release-notes.asciidoc
+++ b/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:
 

diff --git a/epan/Makefile.am b/epan/Makefile.am
index 69bd961a982c973e3b6a6c539b5ad4e483ed3f03..df3000f81fd1f1de77fa5288a7cc9c3feae3a291 100644 (file)
--- a/epan/Makefile.am
+++ b/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
 

diff --git a/make-version.pl b/make-version.pl
index 6ab4ab9b1bf77c637122c422da7ffeb1adea1325..3593b626eda16118ab1c6202ec9ba9c4fd21a0e5 100755 (executable)
--- a/make-version.pl
+++ b/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 = "";

diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index a689bb5514528d1ad8e227cef5ea465388c275b0..3e657565b8e1e0a45608cb68eb0e6c557471a4cd 100644 (file)
--- a/wiretap/Makefile.am
+++ b/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