diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-09-24 03:29:21 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-09-24 03:29:21 +0000 |
| commit | 2ed9fdf00e23edaabdff7bd7cc4c8b0989e366f1 (patch) | |
| tree | 81f31ad14e440d67f00110273d183feb2eba97bd | |
| parent | 69c7082a64821a3db9b2e679a25dafbe5f91579c (diff) | |
Switch back to normal versioning. Bump the development version to 1.1.2.
svn path=/trunk/; revision=26259
| -rw-r--r-- | config.nmake | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | make-version.pl | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/config.nmake b/config.nmake index ab078f34ee..f21171dddd 100644 --- a/config.nmake +++ b/config.nmake @@ -16,7 +16,7 @@ PLATFORM=win32 # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged VERSION_MAJOR=1 VERSION_MINOR=1 -VERSION_MICRO=1 +VERSION_MICRO=2 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 4995c88ef7..ff1e0f2301 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ dnl AC_CANONICAL_HOST dnl AC_CANONICAL_BUILD dnl AC_CANONICAL_TARGET -AC_INIT(wireshark, 1.1.1) +AC_INIT(wireshark, 1.1.2) AM_INIT_AUTOMAKE([1.9 tar-ustar]) AM_DISABLE_STATIC diff --git a/make-version.pl b/make-version.pl index 8f79c3b7d4..5956e9d926 100755 --- a/make-version.pl +++ b/make-version.pl @@ -70,10 +70,8 @@ my %version_pref = ( "enable" => 1, "svn_client" => 0, "format" => "SVN %Y%m%d%H%M%S", - #"pkg_enable" => 1, - #"pkg_format" => "-SVN-%#", - "pkg_enable" => 0, - "pkg_format" => "", + "pkg_enable" => 1, + "pkg_format" => "-SVN-%#", ); my $srcdir = "."; |