diff options
| -rw-r--r-- | config.nmake | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | docbook/asciidoc.conf | 2 | ||||
| -rw-r--r-- | docbook/release-notes.asciidoc | 5 | ||||
| -rw-r--r-- | epan/Makefile.am | 2 | ||||
| -rwxr-xr-x | make-version.pl | 10 | ||||
| -rw-r--r-- | wiretap/Makefile.am | 2 |
8 files changed, 16 insertions, 11 deletions
diff --git a/config.nmake b/config.nmake index 41fad68a34..a474d08fca 100644 --- 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=1 +VERSION_MICRO=2 VERSION_BUILD=$(SVN_REVISION) # Local build information. Recommended: Unique string for your diff --git a/configure.ac b/configure.ac index 2e542b2f41..d622fab47d 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ m4_define([version_major], [1]) m4_define([version_minor], [11]) -m4_define([version_micro], [1]) +m4_define([version_micro], [2]) m4_define([version_micro_extra], version_micro) m4_append([version_micro_extra], []) diff --git a/debian/changelog b/debian/changelog index 66d8337260..8348397779 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.11.1) unstable; urgency=low +wireshark (1.11.2) unstable; urgency=low * Self-made package diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index 8b71374a08..026fe0d4b2 100644 --- a/docbook/asciidoc.conf +++ b/docbook/asciidoc.conf @@ -4,7 +4,7 @@ [replacements] # Yes, this is a fake macro. -wireshark-version:\[\]=1.11.1 +wireshark-version:\[\]=1.11.2 [macros] diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index 3867ece140..e709decfb1 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -24,6 +24,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.1: + +* All sorts of amazing things. + +The following features are new (or have been significantly updated) since version 1.11.0: * Qt port: diff --git a/epan/Makefile.am b/epan/Makefile.am index 4ccb7a3a10..907ae666df 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:0:0 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 0:2:0 @LDFLAGS_SHAREDLIB@ include Makefile.common diff --git a/make-version.pl b/make-version.pl index 39a56254b2..a2d8e93868 100755 --- 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" => 1, + "version_micro" => 2, "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 8f86c012c6..a689bb5514 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:0:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 0:2:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL |