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

diff --git a/debian_build.py b/debian_build.py
index afeda70b36bb9895ebe1655b6f99839511e48c2d..f1260aba04643dc4a74a5a7b8c6c728951e9cb64 100755 (executable)
--- 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))
         ]