@@ -1,11 +1,11 @@

-Apply this patch to '_version.py' to get Miniver to calculate

-the version using unannotated tags in addition to annotated tags

-@@ -75,7 +75,7 @@ def get_version_from_git():

-     for opts in [['--first-parent'], []]:

+Apply this patch to "_version.py" to get Miniver to calculate the

+version using unannotated tags in addition to annotated tags.

+@@ -86,7 +86,7 @@ def get_version_from_git():

+     for opts in [["--first-parent"], []]:

          try:

              p = subprocess.Popen(

--                ['git', 'describe', '--long', '--always'] + opts,

-+                ['git', 'describe', '--long', '--always', '--tags'] + opts,

+-                ["git", "describe", "--long", "--always"] + opts,

++                ["git", "describe", "--long", "--always", "--tags"] + opts,

                  cwd=distr_root,

-                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)

-         except OSError:

+                 stdout=subprocess.PIPE,

+                 stderr=subprocess.PIPE,