aboutsummaryrefslogtreecommitdiffstats
path: root/make-version.pl
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-03-28 18:13:22 +0000
committerGerald Combs <gerald@wireshark.org>2013-03-28 18:13:22 +0000
commitb60e41b984828b06c8190448a32c7f379e2d4d15 (patch)
treee65870d4884e6365589b1fcd2f49ac6486c069dc /make-version.pl
parent5e7d4af0d0278a70d9f56e708ba61828d8f58793 (diff)
1.9.2 → 1.9.3.
svn path=/trunk/; revision=48627
Diffstat (limited to 'make-version.pl')
-rwxr-xr-xmake-version.pl12
1 files changed, 6 insertions, 6 deletions
diff --git a/make-version.pl b/make-version.pl
index ab98c496ba..7e2626729f 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -75,7 +75,7 @@ my $set_release = 0;
my %version_pref = (
"version_major" => 1,
"version_minor" => 9,
- "version_micro" => 2,
+ "version_micro" => 3,
"version_build" => 0,
"enable" => 1,
@@ -85,12 +85,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 $info_cmd = "";
@@ -628,7 +628,7 @@ make-version.pl [options] [source directory]
--set-svn, -s Set the information in svnversion.h
--set-version, -v Set the major, minor, and micro versions in
configure.ac, config.nmake, debian/changelog,
- and docbook/release_notes.xml.
+ and docbook/asciidoc.conf.
Resets the release information when used by
itself.
--set-release, -r Set the release information in configure.ac