From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 28 Sep 2011 15:14:18 +0000 (+0200)
Subject: use --preserve to not rename directories and dont force native package version
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=030ec0f03a0f65f81cd36b23348a3749dc03e2cb;p=profitbricks%2Fjenkins-build-scripts.git

use --preserve to not rename directories and dont force native package version
---

diff --git a/debian_build.py b/debian_build.py
index afeda70..f1260ab 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -380,9 +380,9 @@ if __name__ == '__main__':
         daily_date = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
 
         if options.distribution in ('testing', 'staging'):
-            version = '%s~rc%s-1' %(version, daily_date)
+            version = '%s~rc%s' %(version, daily_date)
         else:
-            version = '%s~develop%s-1' %(version, daily_date)
+            version = '%s~develop%s' %(version, daily_date)
 
         new_log = 'Generated by jenkins build.'
 
@@ -393,6 +393,7 @@ if __name__ == '__main__':
                 '--force-bad-version',
                 '--distribution',
                 '%s' %(options.distribution),
+                '--preserve',
                 '--',
                 '%s' %(''.join(new_log))
         ]