minor fixes for clang++

[senf.git] / debian / SConscript

diff --git a/debian/SConscript b/debian/SConscript
index 85904db..3f2ea5f 100644 (file)
--- 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
@@ -88,7 +91,7 @@ env.Append( ENV = {
 env.Replace(                    
     LOCAL_CONFIG_FILES = [ '/Doxyfile.local', '/SConscript.local', '/senf/local_config.hh' ],
     DPKG_IGNORED_FILES = [ '$LOCAL_CONFIG_FILES', '.svn', '.git', '.gitignore', '/_templates', 
-                           '/TODO', '.project', '.cproject', '.dir.el', '/project.el' ],
+                           '/TODO', '.project', '.cproject', '.dir.el', '/.project.el' ],
     DPKG_IGNORED_FILES_OPTS = dpkgIgnoredFilesOpts,
     BUILDPACKAGE_COMMAND = "dpkg-buildpackage -us -uc -rfakeroot $DPKG_IGNORED_FILES_OPTS",
 )
@@ -108,8 +111,8 @@ env.PhonyTarget('debsrc', [], [
 env.PhonyTarget('debbin', [], [
     checkLocalConf,
     updateRevision,
-    "$BUILDPACKAGE_COMMAND -b",
-    "fakeroot ./debian/rules clean"
+    "$BUILDPACKAGE_COMMAND -b -nc",
+    "fakeroot ./debian/rules debclean"
 ])
 
 if not os.environ.get('debian_build'):