diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-11-24 05:57:05 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-11-24 05:57:05 +0000 |
| commit | f08e18e9a550690c5bb03ff9f31c7d51163275e8 (patch) | |
| tree | 41179fb98c4e204ba611db64183452891e5079f8 | |
| parent | 2076b90455ab4c10c2e4f2af643e5bee5649edd0 (diff) | |
Switch back to normal versioning. Bump the version to 1.3.3.
svn path=/trunk/; revision=31064
| -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 a7321664fb..c08a80ab1e 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=3 -VERSION_MICRO=2 +VERSION_MICRO=3 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 b9c8eafb14..75ecd081c1 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.3.2) +AC_INIT(wireshark, 1.3.3) 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 4c1c36f6d3..788b829736 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.3.2) unstable; urgency=low +wireshark (1.3.3) unstable; urgency=low * Self-made package diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml index 743fa7152b..2db33350dc 100644 --- a/docbook/release-notes.xml +++ b/docbook/release-notes.xml @@ -12,7 +12,7 @@ DOCUMENT SECTION <!-- Wireshark Info --> - <!ENTITY WiresharkCurrentVersion "1.3.2"> + <!ENTITY WiresharkCurrentVersion "1.3.3"> ]> diff --git a/make-version.pl b/make-version.pl index d5589dc6b4..827115e4b7 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 = "."; |