Set the progress bar animation behavior to match other parts of the

[metze/wireshark/wip.git] / make-version.pl

diff --git a/make-version.pl b/make-version.pl
index c4a5ea2eb0ce0fabac7dd4f3e32cd445f23f98c3..13f3b7f3097e68af52ebe8285d899c62819f7c59 100755 (executable)
--- a/make-version.pl
+++ b/make-version.pl
@@ -74,8 +74,8 @@ my $set_version = 0;
 my $set_release = 0;
 my %version_pref = (
        "version_major" => 1,
-       "version_minor" => 9,
-       "version_micro" => 2,
+       "version_minor" => 11,
+       "version_micro" => 1,
        "version_build" => 0,
 
        "enable"        => 1,
@@ -117,7 +117,7 @@ sub read_svn_info {
                $package_format = $version_pref{"pkg_format"};
        }
 
-       if (-d "$srcdir/.svn") {
+       if (-d "$srcdir/.svn" or -d "$srcdir/../.svn") {
                $info_source = "Command line (svn info)";
                $info_cmd = "svn info $srcdir";
        } elsif (-d "$srcdir/.git/svn") {
@@ -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