X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=debian%2FSConscript;h=899b3f618647666d3ee6b2e406f6733a9fb6b08b;hb=0fb5ed1adf2f67dbf47fdfed3f3c8be989cf3618;hp=aea26dbfadc0daee4e79ecbd1693d4640a56ed03;hpb=62bcd1c4c495d8c6b8727dee0e609bbb0c9231f5;p=senf.git diff --git a/debian/SConscript b/debian/SConscript index aea26db..899b3f6 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: @@ -88,7 +86,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", ) @@ -97,7 +95,7 @@ env.PhonyTarget('deb', [], [ checkLocalConf, updateRevision, "$BUILDPACKAGE_COMMAND", - "fakeroot ./debian/rules debclean" + "fakeroot ./debian/rules clean" ]) env.PhonyTarget('debsrc', [], [ @@ -108,7 +106,7 @@ env.PhonyTarget('debsrc', [], [ env.PhonyTarget('debbin', [], [ checkLocalConf, updateRevision, - "$BUILDPACKAGE_COMMAND -b", + "$BUILDPACKAGE_COMMAND -b -nc", "fakeroot ./debian/rules debclean" ])