X-Git-Url: http://git.samba.org/?p=metze%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=make-version.pl;h=f12f8bc590a0bd35c35a99eb7e20808b067e4432;hp=f5c21dd521aa97f269026e9845b30bd65fce3ef9;hb=9058363ed7e99db7a36b9ab8f03ceb635a6cb94e;hpb=6baa1b544c84a766d9f9d356e9940eccaf0a128f diff --git a/make-version.pl b/make-version.pl index f5c21dd521..f12f8bc590 100755 --- a/make-version.pl +++ b/make-version.pl @@ -84,8 +84,8 @@ my $set_version = 0; my $set_release = 0; my %version_pref = ( "version_major" => 2, - "version_minor" => 1, - "version_micro" => 1, + "version_minor" => 3, + "version_micro" => 0, "version_build" => 0, "enable" => 1, @@ -137,7 +137,7 @@ sub read_repo_info { $package_format = $version_pref{"pkg_format"}; } - if (-d "$srcdir/.git" && ! -d "$srcdir/.git/svn") { + if (-e "$srcdir/.git" && ! -d "$srcdir/.git/svn") { $info_source = "Command line (git)"; $version_pref{"git_client"} = 1; } elsif (-d "$srcdir/.svn" or -d "$srcdir/../.svn") { @@ -255,7 +255,7 @@ sub read_repo_info { unlink($tortoise_file); } - if ($num_commits == 0 and -d "$srcdir/.git") { + if ($num_commits == 0 and -e "$srcdir/.git") { # Try git... eval {