From 154c6f37723d1a2eb0db350c8d9846e619b5f821 Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@nedk.org>
Date: Sun, 26 Nov 2023 16:57:45 +0200
Subject: [PATCH 1/3] wscript: Fix dist target

---
 wscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wscript b/wscript
index eee86695..e2f1c7a6 100644
--- a/wscript
+++ b/wscript
@@ -719,7 +719,7 @@ class ladish_dist(Scripting.Dist):
     fun = 'dist'
 
     def __init__(self):
-        Dist.__init__(self)
+        Scripting.Dist.__init__(self)
         if Options.options.distname:
             self.base_name = Options.options.distname
         else:
@@ -740,7 +740,7 @@ class ladish_dist(Scripting.Dist):
         return self.base_name
 
     def get_excl(self):
-        excl = Dist.get_excl(self)
+        excl = Scripting.Dist.get_excl(self)
 
         excl += ' .gitmodules'
         excl += ' GTAGS'

From d2c84311ce6491b5412279b2b92968a7c74fcea2 Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@nedk.org>
Date: Sun, 26 Nov 2023 17:03:53 +0200
Subject: [PATCH 2/3] wscript: always put the short sha1 in the tarball name

---
 wscript | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wscript b/wscript
index e2f1c7a6..321b2bc6 100644
--- a/wscript
+++ b/wscript
@@ -724,7 +724,8 @@ class ladish_dist(Scripting.Dist):
             self.base_name = Options.options.distname
         else:
             try:
-                self.base_name = self.cmd_and_log("LANG= git describe --tags", quiet=Context.BOTH).splitlines()[0]
+                sha = self.cmd_and_log("LANG= git rev-parse --short HEAD", quiet=Context.BOTH).splitlines()[0]
+                self.base_name = APPNAME + '-' + VERSION + "-g" + sha
             except:
                 self.base_name = APPNAME + '-' + VERSION
         self.base_name += Options.options.distsuffix

From 36c489e43ce7375a7ef176a22b1db0843af223ca Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@nedk.org>
Date: Sun, 26 Nov 2023 17:07:26 +0200
Subject: [PATCH 3/3] Bump version to 1.1

---
 wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wscript b/wscript
index 321b2bc6..d49bc193 100644
--- a/wscript
+++ b/wscript
@@ -7,7 +7,7 @@ from __future__ import with_statement
 parallel_debug = False
 
 APPNAME='ladish'
-VERSION='1'
+VERSION='1.1'
 DBUS_NAME_BASE = 'org.ladish'
 RELEASE = True