X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=debian%2FSConscript;h=3f2ea5f6f8eddd758d46a161c6e0e364026344e8;hb=refs%2Fheads%2Fmaster;hp=33e6c81073c7467e0a94441c38d2cc7789729e23;hpb=a5d6a20ef608461a1932b4983139e8a3c1facada;p=senf.git diff --git a/debian/SConscript b/debian/SConscript index 33e6c81..3f2ea5f 100644 --- a/debian/SConscript +++ b/debian/SConscript @@ -66,9 +66,7 @@ if os.environ.get('debian_build'): else: rev = 'r' + os.popen("svnversion").read().strip().lower() if rev == 'rexported': - rev = 'r' + os.popen("gitsvnversion").read().strip().lower() - if rev == '': - rev = 'unknown' + rev = os.popen("gitsvnversion").read().strip().lower() logname = os.environ.get('LOGNAME') if not logname: @@ -78,6 +76,11 @@ def dpkgIgnoredFilesOpts(target, source, env, for_signature): return [ '-I%s' % (('/' in f) and (os.path.split(os.getcwd())[1])+f or f) for f in env.subst('$DPKG_IGNORED_FILES').split() ] +if env.has_key('REVISION'): + rev = env['REVISION'] +# else: +# rev = "(Version %s)" % rev + env.Append( ENV = { 'REVISION': rev, 'LOGNAME' : logname, # needed by the debian build scripts