Make version acceptable to dpkg-buildpackage even if the git commit hash starts with...

diff --git a/cscript b/cscript
index d789c713cd2c55dfc423baa313c27351c0d6818d..67c73453b62194f465a7146cad6f82ab59c52d35 100644 (file)
--- a/cscript
+++ b/cscript
@@ -745,12 +745,12 @@ def package_debian(target, cpu, version, options):
 
     os.makedirs('build/deb')
     os.chdir('build/deb')
-    shutil.move(f'../../dcpomatic-{version}.tar.bz2', f'{name}_{version}.orig.tar.bz2')
-    target.command(f'tar xjf {name}_{version}.orig.tar.bz2')
+    shutil.move(f'../../dcpomatic-{version}.tar.bz2', f'{name}_1+{version}.orig.tar.bz2')
+    target.command(f'tar xjf {name}_1+{version}.orig.tar.bz2')
     os.chdir(f'dcpomatic-{version}')
 
     with open('debian/changelog', 'w') as f:
-        print(f'{name} ({version}-1) unstable; urgency=medium', file=f)
+        print(f'{name} (1+{version}-1) unstable; urgency=medium', file=f)
         print('', file=f)
         print('  * New upstream release.', file=f)
         print('', file=f)