aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-03-18 22:18:52 +0000
committerGerald Combs <gerald@wireshark.org>2013-03-18 22:18:52 +0000
commit4c87778b7a531358f831ddb945671f5e0caff00c (patch)
tree6ade01cb080c0ec09677fe846e4b45cff60ef652
parent6bc16a77b0e2fa26f7aae595706ba05cb9ad3225 (diff)
1.9.1 → 1.9.2.
svn path=/trunk/; revision=48406
-rw-r--r--config.nmake2
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog2
-rw-r--r--debian/wireshark-common.files4
-rw-r--r--epan/Makefile.am2
-rw-r--r--wiretap/Makefile.am2
6 files changed, 7 insertions, 7 deletions
diff --git a/config.nmake b/config.nmake
index 18c5ebad41..34099da690 100644
--- a/config.nmake
+++ b/config.nmake
@@ -29,7 +29,7 @@ SVN_REVISION=0
# Updated by make-version.pl
VERSION_MAJOR=1
VERSION_MINOR=9
-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 82d1d68961..11798010b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
m4_define([version_major], [1])
m4_define([version_minor], [9])
-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 1a444a4363..5cf488c1a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (1.9.1) unstable; urgency=low
+wireshark (1.9.2) unstable; urgency=low
* Self-made package
diff --git a/debian/wireshark-common.files b/debian/wireshark-common.files
index ead5f8edbe..3bef7fad3e 100644
--- a/debian/wireshark-common.files
+++ b/debian/wireshark-common.files
@@ -8,9 +8,9 @@
/usr/bin/reordercap
/usr/bin/text2pcap
/usr/lib/wireshark/libwireshark.so.0
-/usr/lib/wireshark/libwireshark.so.0.0.0
+/usr/lib/wireshark/libwireshark.so.0.0.2
/usr/lib/wireshark/libwiretap.so.0
-/usr/lib/wireshark/libwiretap.so.0.0.0
+/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/epan/Makefile.am b/epan/Makefile.am
index 5eafa53b1a..6b2def594a 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/wiretap/Makefile.am b/wiretap/Makefile.am
index fc430dc961..6a4f9cf1ba 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