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

1.9.3 → 1.11.0. 

svn path=/trunk/; revision=48972
This commit is contained in:
Gerald Combs 2013-04-22 17:59:38 +00:00
parent a5037603ce
commit ea19c7f952
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.nmake
View File

@ -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

4
configure.ac
View File

@ -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], [])

2
debian/changelog vendored
View File

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

4
debian/wireshark-common.files vendored
View File

@ -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/*

2
docbook/asciidoc.conf
View File

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

2
epan/Makefile.am
View File

@ -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

4
make-version.pl
View File

@ -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,

2
wiretap/Makefile.am
View File

@ -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