packet-dcerpc: nca_s_fault_sec_pkg_error
[metze/wireshark/wip.git] / make-version.pl
index 0ce9e9bb85f5dadc23927881095b97e3f9467d9e..f12f8bc590a0bd35c35a99eb7e20808b067e4432 100755 (executable)
@@ -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,
@@ -95,12 +95,12 @@ my %version_pref = (
        "format"        => "git %Y%m%d%H%M%S",
 
        # Normal development builds
-       #"pkg_enable" => 1,
-       #"pkg_format" => "-%#",
+       "pkg_enable" => 1,
+       "pkg_format" => "-%#",
 
        # Development releases
-       "pkg_enable" => 0,
-       "pkg_format" => "",
+       #"pkg_enable" => 0,
+       #"pkg_format" => "",
        );
 my $srcdir = ".";
 my $info_cmd = "";
@@ -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 {