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

1.7.1 → 1.7.2. 

svn path=/trunk/; revision=41971
This commit is contained in:
Gerald Combs 2012-04-06 17:27:20 +00:00
parent b20527cb7f
commit e5cd6c087e
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.nmake
View File

@ -19,7 +19,7 @@ SVN_REVISION=0
# Updated by make-version.pl
VERSION_MAJOR=1
VERSION_MINOR=7
VERSION_MICRO=1
VERSION_MICRO=2
VERSION_BUILD=$(SVN_REVISION)
# Local build information. Recommended: Unique string for your

2
configure.in
View File

@ -2,7 +2,7 @@
#
AC_PREREQ(2.60)
AC_INIT(wireshark, 1.7.1)
AC_INIT(wireshark, 1.7.2)
dnl Check for CPU / vendor / OS
dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or

2
debian/changelog vendored
View File

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

4
debian/wireshark-common.files vendored
View File

@ -5,9 +5,9 @@
/usr/bin/text2pcap
/usr/bin/rawshark
/usr/lib/wireshark/libwireshark.so.0
/usr/lib/wireshark/libwireshark.so.0.0.1
/usr/lib/wireshark/libwireshark.so.0.0.2
/usr/lib/wireshark/libwiretap.so.0
/usr/lib/wireshark/libwiretap.so.0.0.1
/usr/lib/wireshark/libwiretap.so.0.0.2
/usr/lib/wireshark/libwsutil.so.0
/usr/lib/wireshark/libwsutil.so.0.0.0
/usr/lib/wireshark/plugins/*

2
docbook/release-notes.xml
View File

@ -12,7 +12,7 @@ DOCUMENT SECTION
<!--
Wireshark Info
-->
<!ENTITY WiresharkCurrentVersion "1.7.1">
<!ENTITY WiresharkCurrentVersion "1.7.2">
]>

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:1:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
libwireshark_la_LDFLAGS = -version-info 0:2:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@
include Makefile.common

10
make-version.pl
View File

@ -75,7 +75,7 @@ my $set_release = 0;
my %version_pref = (
"version_major" => 1,
"version_minor" => 7,
"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 $svn_info_cmd = "";

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:1:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
libwiretap_la_LDFLAGS = -version-info 0:2:0 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@
if HAVE_WARNINGS_AS_ERRORS
AM_NON_GENERATED_CFLAGS = -Werror