fix-version.diff: Append +git to prerelease tag, don't require git.

debian/changelog

@@ -37,6 +37,7 @@ freeipa (4.7.0~pre1+git20180411-1) UNRELEASED; urgency=medium
   * control: Depend on chrony instead of ntp.
   * fix-paths.diff: Add CHRONY_CONF.
   * python-ipaserver.install: Updated after dropping NTP.
+  * fix-version.diff: Append +git to prerelease tag, don't require git.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 06 Apr 2018 16:18:42 +0300
 

debian/patches/fix-version.diff

@@ -0,0 +1,20 @@
+--- a/VERSION.m4
++++ b/VERSION.m4
+@@ -31,7 +31,7 @@ define(IPA_VERSION_RELEASE, 90)
+ # e.g. define(IPA_VERSION_PRE_RELEASE, rc1)            #
+ #  ->  "1.0.0rc1"                                      #
+ ########################################################
+-define(IPA_VERSION_PRE_RELEASE, .pre1)
++define(IPA_VERSION_PRE_RELEASE, .pre1+git20180411)
+ 
+ ########################################################
+ # To mark GIT snapshots this should be set to 'yes'    #
+@@ -46,7 +46,7 @@ define(IPA_VERSION_PRE_RELEASE, .pre1)
+ # This option works only with GNU m4:                  #
+ # it requires esyscmd m4 macro.                        #
+ ########################################################
+-define(IPA_VERSION_IS_GIT_SNAPSHOT, yes)
++define(IPA_VERSION_IS_GIT_SNAPSHOT, no)
+ 
+ ########################################################
+ # git development branch:                              #

debian/patches/series

@@ -15,3 +15,4 @@ fix-bind-ldap-so-path.diff
 fix-paths.diff
 hack-tomcat-race.diff
 hack-duplicate-cert-directive.diff
+fix-version.diff