Fixed|Builder|Ubuntu: Marking a new version

distrib/autobuild.py

@@ -150,14 +150,12 @@ def update_changes(debChanges=False):
         # Also update the doomsday-fmod changelog (just version number).
         os.chdir(os.path.join(builder.config.DISTRIB_DIR, 'dsfmod'))
 
-        # Clear the old stuff.
-        os.system('echo "" > debian/changelog')
-
         fmodVer = build_version.parse_header_for_version('../../doomsday/plugins/fmod/include/version.h')
         debVer = "%s.%s.%s-%s" % (fmodVer[0], fmodVer[1], fmodVer[2], todays_build_tag())
         print "Marking new FMOD version:", debVer
         msg = 'New release: Doomsday Engine build %i.' % builder.Event().number()
-        os.system('dch --check-dirname-level 0 -v %s -b "%s"' % (debVer, msg))
+        os.system('rm -f debian/changelog && dch --check-dirname-level 0 --create --package doomsday-fmod -v %s "%s"' % (debVer, msg))
+
     else:
         # Save version information.
         print >> file(builder.Event(toTag).file_path('version.txt'), 'wt'), \

distrib/builder/changes.py

@@ -296,16 +296,18 @@ def generate(self, format):
 
             # Append the changes to the debian package changelog.
             os.chdir(os.path.join(config.DISTRIB_DIR, 'linux'))
-            os.system('echo "" > ../debian/changelog')
-
+
             # First we need to update the version.
             debVersion = build_version.DOOMSDAY_VERSION_FULL + '-' + Event().tag()
 
             # Always make one entry.
             print 'Marking new version...'
             msg = 'New release: %s build %i.' % (build_version.DOOMSDAY_RELEASE_TYPE,
                                                  Event().number())
-            os.system("dch -b --check-dirname-level 0 -v %s \"%s\"" % (debVersion, msg))
+
+            # Reset the changelog.
+            os.system('rm -f ../debian/changelog && ' + \
+                'dch --check-dirname-level=0 --create --package doomsday -v %s "%s"' % (debVersion, msg))
 
             for entry in self.debChangeEntries:
                 # Quote it for the command line.