Generate more unique and ordered version numbers for Debian builds

Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>

diff --git a/admin/linux/debian/scripts/git2changelog.py b/admin/linux/debian/scripts/git2changelog.py
index 51c6afac0fa4d6e04c66bfcdf4e7f66f600e7858..a48cafe51c2cd9335cd29ff97dff5f008b20770b 100755 (executable)
--- a/admin/linux/debian/scripts/git2changelog.py
+++ b/admin/linux/debian/scripts/git2changelog.py
@@ -79,7 +79,9 @@ def collectEntries(baseCommit, baseVersion, kind):
         words = line.split("\t")
         (commit, name, email, date, revdate) = words[0:5]
         subject = "\t".join(words[5:])
+
         revdate = datetime.datetime.utcfromtimestamp(long(revdate)).strftime("%Y%m%d.%H%M%S")
+        revdate += "." + commit
 
         kind = "beta"
 
@@ -113,6 +115,11 @@ def collectEntries(baseCommit, baseVersion, kind):
         entries.append((commit, name, email, date, revdate, subject,
                         baseVersion, kind))
 
+    if entries:
+        (commit, name, email, date, revdate, subject, baseVersion, kind) = entries[-1]
+        revdate = datetime.datetime.now().strftime("%Y%m%d.%H%M%S")+ "." + commit
+        entries[-1] = (commit, name, email, date, revdate, subject, baseVersion, kind)
+
     entries.reverse()
 
     return entries