diff options
author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-08 22:35:56 +0000 |
---|---|---|
committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-08 22:35:56 +0000 |
commit | f235ad5590d7e16d1d573025fab9241723be396b (patch) | |
tree | 90f4418c25780074f51d0f7e69efa1372abefdac | |
parent | 409658d3012fed2b29c3a6aa53edada7280a7419 (diff) |
1.7.0 → 1.7.1.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39769 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | config.nmake | 2 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | docbook/release-notes.xml | 2 | ||||
-rwxr-xr-x | make-version.pl | 8 |
5 files changed, 8 insertions, 8 deletions
diff --git a/config.nmake b/config.nmake index d3d581cea1..ad7ad4f3e7 100644 --- a/config.nmake +++ b/config.nmake @@ -16,7 +16,7 @@ WIRESHARK_TARGET_PLATFORM=win32 # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged VERSION_MAJOR=1 VERSION_MINOR=7 -VERSION_MICRO=0 +VERSION_MICRO=1 VERSION_BUILD=0 # It's recommended to change VERSION_EXTRA for your own custom builds # e.g. "-SVN-12345" diff --git a/configure.in b/configure.in index 9ffa509b55..77aef63bdc 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.7.0) +AC_INIT(wireshark, 1.7.1) 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 78d419a88f..11241b3f29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.7.0) unstable; urgency=low +wireshark (1.7.1) unstable; urgency=low * Self-made package diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml index 01360434ae..3d3808bb67 100644 --- a/docbook/release-notes.xml +++ b/docbook/release-notes.xml @@ -12,7 +12,7 @@ DOCUMENT SECTION <!-- Wireshark Info --> - <!ENTITY WiresharkCurrentVersion "1.7.0"> + <!ENTITY WiresharkCurrentVersion "1.7.1"> ]> diff --git a/make-version.pl b/make-version.pl index 107dad810b..38c84c1859 100755 --- a/make-version.pl +++ b/make-version.pl @@ -78,12 +78,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 = ""; |