osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

1.11.3 → 1.11.4. 

Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019
Reviewed-on: https://code.wireshark.org/review/1154
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2014-04-15 09:57:24 -07:00
parent 1dd5d3a6aa
commit d73d1f14b3
9 changed files with 12 additions and 26612 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26600
ChangeLog
View File

File diff suppressed because it is too large Load Diff

2
config.nmake
View File

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

2
configure.ac
View File

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

2
debian/changelog vendored
View File

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

2
docbook/asciidoc.conf
View File

@ -4,7 +4,7 @@
# Yes, these are fake macros.
# We should probably replace some or all of them with attributes.
wireshark-version:\[\]=1.11.3
wireshark-version:\[\]=1.11.4
wireshark-major-minor-version:\[\]=1.11
wireshark-authors-url:\[\]=http://www.wireshark.org/about.html#authors

2
epan/Makefile.am
View File

@ -54,7 +54,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:4:0 @LDFLAGS_SHAREDLIB@
include Makefile.common

2
filetap/Makefile.am
View File

@ -27,7 +27,7 @@ include Makefile.common
lib_LTLIBRARIES = libfiletap.la
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
libfiletap_la_LDFLAGS = -version-info 0:3:0 @LDFLAGS_SHAREDLIB@
libfiletap_la_LDFLAGS = -version-info 0:4:0 @LDFLAGS_SHAREDLIB@
AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL

10
make-version.pl
View File

@ -76,7 +76,7 @@ my $set_release = 0;
my %version_pref = (
"version_major" => 1,
"version_minor" => 11,
"version_micro" => 3,
"version_micro" => 4,
"version_build" => 0,
"enable" => 1,
@ -87,12 +87,12 @@ my %version_pref = (
"is_release" => 0,
# Normal development builds
#"pkg_enable" => 1,
#"pkg_format" => "-%#",
"pkg_enable" => 1,
"pkg_format" => "-%#",
# Development releases
"pkg_enable" => 0,
"pkg_format" => "",
#"pkg_enable" => 0,
#"pkg_format" => "",
);
my $srcdir = ".";
my $info_cmd = "";

2
wiretap/Makefile.am
View File

@ -28,7 +28,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:4:0 @LDFLAGS_SHAREDLIB@
AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL