diff options
author | Gerald Combs <gerald@wireshark.org> | 2011-01-24 19:27:38 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2011-01-24 19:27:38 +0000 |
commit | 1635ef0ddfabf66d7ec95cc0b884e2d6efea6f15 (patch) | |
tree | 6341f474a7f74cc9791e6f85b0a27251b7a39751 | |
parent | df985b71406ccae81cfed171f02b7a195c3a3c9e (diff) |
1.5.0 → 1.5.1.
svn path=/trunk/; revision=35639
-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 456fb32e0f..7405cbc24b 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=5 -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 890a9ca89b..a4c7a97db3 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.5.0) +AC_INIT(wireshark, 1.5.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 b56090bc20..524d7e6db9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.5.0) unstable; urgency=low +wireshark (1.5.1) unstable; urgency=low * Self-made package diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml index c14b233add..f006551bbd 100644 --- a/docbook/release-notes.xml +++ b/docbook/release-notes.xml @@ -12,7 +12,7 @@ DOCUMENT SECTION <!-- Wireshark Info --> - <!ENTITY WiresharkCurrentVersion "1.5.0"> + <!ENTITY WiresharkCurrentVersion "1.5.1"> ]> diff --git a/make-version.pl b/make-version.pl index 8807dcf3c6..f59ba21495 100755 --- a/make-version.pl +++ b/make-version.pl @@ -72,12 +72,12 @@ my %version_pref = ( "format" => "SVN %Y%m%d%H%M%S", # 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 = "."; |