diff options
| -rw-r--r-- | config.nmake | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/wireshark-common.files | 4 | ||||
| -rw-r--r-- | docbook/release-notes.xml | 2 | ||||
| -rw-r--r-- | epan/Makefile.am | 2 | ||||
| -rwxr-xr-x | make-version.pl | 10 | ||||
| -rw-r--r-- | wiretap/Makefile.am | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/config.nmake b/config.nmake index 18f5fa6a72..6c84ce4849 100644 --- a/config.nmake +++ b/config.nmake @@ -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 diff --git a/configure.in b/configure.in index d836c64989..a71026dc41 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/debian/changelog b/debian/changelog index 11241b3f29..7ce88995b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.7.1) unstable; urgency=low +wireshark (1.7.2) unstable; urgency=low * Self-made package diff --git a/debian/wireshark-common.files b/debian/wireshark-common.files index 62d2ee5f6e..089f2d1075 100644 --- a/debian/wireshark-common.files +++ b/debian/wireshark-common.files @@ -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/* diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml index d0e497a5cd..b5b998b958 100644 --- a/docbook/release-notes.xml +++ b/docbook/release-notes.xml @@ -12,7 +12,7 @@ DOCUMENT SECTION <!-- Wireshark Info --> -<!ENTITY WiresharkCurrentVersion "1.7.1"> +<!ENTITY WiresharkCurrentVersion "1.7.2"> ]> diff --git a/epan/Makefile.am b/epan/Makefile.am index 9dd0b16a65..f0134c0740 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: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 diff --git a/make-version.pl b/make-version.pl index 5023472e8a..c1ee3f6de5 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" => 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 = ""; diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 0ee92af674..97ca343efd 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: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 |