summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2013-12-27 16:35:52 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2013-12-27 16:35:52 (GMT)
commit06767e6e374c88a1e840459845bd30db48e95376 (patch)
tree2f9259d752f80b7370c44b31e77b5137aafaaadb
parentf2b2382afc1109ee192a6d8eb310b3dc2a41807e (diff)
downloadSCons-06767e6e374c88a1e840459845bd30db48e95376.zip
SCons-06767e6e374c88a1e840459845bd30db48e95376.tar.gz
SCons-06767e6e374c88a1e840459845bd30db48e95376.tar.bz2
release process: Fix deb filename to agree with what's actually generated.
-rw-r--r--SConstruct5
1 files changed, 4 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index f289947..3f4d703 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1039,7 +1039,10 @@ for p in [ scons ]:
if dh_builddeb and fakeroot:
# Our Debian packaging builds directly into build/dist,
# so we don't need to Install() the .debs.
- deb = os.path.join(build_dir, 'dist', "%s_%s_all.deb" % (pkg, version))
+ # The built deb is called just x.y.z, not x.y.z.final.0 so strip those off:
+ deb_version = '.'.join(version.split('.')[0:3])
+ deb = os.path.join(build_dir, 'dist', "%s_%s_all.deb" % (pkg, deb_version))
+ # print "Building deb into %s (version=%s)"%(deb, deb_version)
for d in p['debian_deps']:
b = env.SCons_revision(os.path.join(build, d), d)
env.Depends(deb, b)