diff --git a/config.nmake b/config.nmake index 3e69e278da..f257292d90 100644 --- a/config.nmake +++ b/config.nmake @@ -28,8 +28,8 @@ SVN_REVISION=0 # The current Wireshark version. Recommended: Leave unchanged. # Updated by make-version.pl VERSION_MAJOR=1 -VERSION_MINOR=9 -VERSION_MICRO=3 +VERSION_MINOR=11 +VERSION_MICRO=0 VERSION_BUILD=$(SVN_REVISION) # Local build information. Recommended: Unique string for your diff --git a/configure.ac b/configure.ac index e0268d4110..720b3f1c4c 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ # m4_define([version_major], [1]) -m4_define([version_minor], [9]) -m4_define([version_micro], [3]) +m4_define([version_minor], [11]) +m4_define([version_micro], [0]) m4_define([version_micro_extra], version_micro) m4_append([version_micro_extra], []) diff --git a/debian/changelog b/debian/changelog index fa950de9a4..b15c7ca552 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.9.3) unstable; urgency=low +wireshark (1.11.0) unstable; urgency=low * Self-made package diff --git a/debian/wireshark-common.files b/debian/wireshark-common.files index da6564c615..ead5f8edbe 100644 --- a/debian/wireshark-common.files +++ b/debian/wireshark-common.files @@ -8,9 +8,9 @@ /usr/bin/reordercap /usr/bin/text2pcap /usr/lib/wireshark/libwireshark.so.0 -/usr/lib/wireshark/libwireshark.so.0.0.3 +/usr/lib/wireshark/libwireshark.so.0.0.0 /usr/lib/wireshark/libwiretap.so.0 -/usr/lib/wireshark/libwiretap.so.0.0.3 +/usr/lib/wireshark/libwiretap.so.0.0.0 /usr/lib/wireshark/libwsutil.so.0 /usr/lib/wireshark/libwsutil.so.0.0.0 /usr/lib/wireshark/plugins/* diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index 4ef33ce999..ab109297d9 100644 --- a/docbook/asciidoc.conf +++ b/docbook/asciidoc.conf @@ -4,7 +4,7 @@ [replacements] # Yes, this is a fake macro. -wireshark-version:\[\]=1.9.3 +wireshark-version:\[\]=1.11.0 [macros] diff --git a/epan/Makefile.am b/epan/Makefile.am index 26cd9b3fe7..f77d645ee9 100644 --- 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:3:0 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ include Makefile.common diff --git a/make-version.pl b/make-version.pl index 7e2626729f..2d1ca839f4 100755 --- a/make-version.pl +++ b/make-version.pl @@ -74,8 +74,8 @@ my $set_version = 0; my $set_release = 0; my %version_pref = ( "version_major" => 1, - "version_minor" => 9, - "version_micro" => 3, + "version_minor" => 11, + "version_micro" => 0, "version_build" => 0, "enable" => 1, diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 3b21a4ed89..fc430dc961 100644 --- 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:3:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL